From a6c6776d93ee0ec6bd8aefa23ac107262cf93154 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 20 Apr 2022 18:28:20 -0400
Subject: [PATCH] Bug fixing for CCVPN IBN closed-loop operation.

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

Former-commit-id: 3d64bd2c4e31b1673ab7857d9d3449269b9ae1d1
---
 ...cll-vnf-topology-operation-cll-F1-Activate.json | 2665 ++++----
 ...URCE-API_cll-vnf-topology-operation-cll-F1.json | 2082 +++---
 ...logy-operation-cll-callbackdg-notification.json |  136 +-
 ...ll-vnf-topology-operation-cll-create-clean.json | 5352 +++++++--------
 ...-API_cll-vnf-topology-operation-cll-modify.json | 7120 ++++++++++----------
 ...ogy-operation-get-otn-tunnel-path-from-oof.json | 2582 +++----
 ..._cll-vnf-topology-operation-cll-F1-Activate.xml | 1024 ++-
 ...OURCE-API_cll-vnf-topology-operation-cll-F1.xml |   36 +-
 ...ology-operation-cll-callbackdg-notification.xml |   23 +-
 ...cll-vnf-topology-operation-cll-create-clean.xml |   44 +-
 ...E-API_cll-vnf-topology-operation-cll-modify.xml |   30 +-
 .../src/main/json/cll-call-ves.json                |    6 +-
 12 files changed, 10766 insertions(+), 10334 deletions(-)

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 035df45f..b318a731 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": "b052f7e.a3d5288",
+        "id": "190659b8.bcae0e",
         "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": 356.75,
-        "y": 462,
-        "z": "111f91bb.269a56",
+        "x": 353.566650390625,
+        "y": 335,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "e207ef26.f8a29",
-                "15b30bbc.e66fc4",
-                "c73b1c6f.dfba4"
+                "b2e66c4e.a3d2f8",
+                "35dfe125.6c620e",
+                "69d67799.ffee68"
             ]
         ]
     },
     {
-        "id": "e207ef26.f8a29",
+        "id": "b2e66c4e.a3d2f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 544.75,
-        "y": 475,
-        "z": "111f91bb.269a56",
+        "x": 541.566650390625,
+        "y": 348,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "53374de6.fbbc9c"
+                "a7669132.5699f8"
             ]
         ]
     },
     {
-        "id": "15b30bbc.e66fc4",
+        "id": "35dfe125.6c620e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 552.2409362792969,
-        "y": 517.5740356445312,
-        "z": "111f91bb.269a56",
+        "x": 549.0575866699219,
+        "y": 390.57403564453125,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "c73b1c6f.dfba4",
+        "id": "69d67799.ffee68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 542.75,
-        "y": 564,
-        "z": "111f91bb.269a56",
+        "x": 539.566650390625,
+        "y": 437,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "1d9a3789.c423c"
+                "7627d017.e729d8"
             ]
         ]
     },
     {
-        "id": "53374de6.fbbc9c",
+        "id": "a7669132.5699f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 717.75,
-        "y": 473,
-        "z": "111f91bb.269a56",
+        "x": 714.566650390625,
+        "y": 346,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "74134804.4c5ab"
+                "efea1cd6.23d6f8"
             ]
         ]
     },
     {
-        "id": "74134804.4c5ab",
+        "id": "efea1cd6.23d6f8",
         "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": 946.75,
-        "y": 474,
-        "z": "111f91bb.269a56",
+        "x": 943.566650390625,
+        "y": 347,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "88398d04.70bb08"
+                "afe63db8.26dbd8"
             ]
         ]
     },
     {
-        "id": "88398d04.70bb08",
+        "id": "afe63db8.26dbd8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1161.75,
-        "y": 475,
-        "z": "111f91bb.269a56",
+        "x": 1158.566650390625,
+        "y": 348,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "60755719.5aec98"
+                "46ace79f.7f246"
             ]
         ]
     },
     {
-        "id": "23c1dec0.4bd442",
+        "id": "356939c7.7d339e",
         "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": 1415.75,
-        "y": 397,
-        "z": "111f91bb.269a56",
+        "x": 1412.566650390625,
+        "y": 270,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "14654146.223b47",
-                "d151f4bf.d5f298"
+                "a076eac6.b4101",
+                "488c763c.46cdf"
             ]
         ]
     },
     {
-        "id": "14654146.223b47",
+        "id": "a076eac6.b4101",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1632.75,
-        "y": 376,
-        "z": "111f91bb.269a56",
+        "x": 1629.566650390625,
+        "y": 249,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "60755719.5aec98"
+                "46ace79f.7f246"
             ]
         ]
     },
     {
-        "id": "d151f4bf.d5f298",
+        "id": "488c763c.46cdf",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1632.75,
-        "y": 425,
-        "z": "111f91bb.269a56",
+        "x": 1629.566650390625,
+        "y": 298,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "60755719.5aec98",
+        "id": "46ace79f.7f246",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1816.75,
-        "y": 462,
-        "z": "111f91bb.269a56",
+        "x": 1813.566650390625,
+        "y": 335,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "e58078ca.32c2b8",
-                "db55a5db.cc9e2",
-                "d1721022.90ae5"
+                "5d0d530d.21fb2c",
+                "d6a4c941.f116b8",
+                "84203861.d12558"
             ]
         ]
     },
     {
-        "id": "ebc2ede2.3e82f8",
+        "id": "578597dc.f76518",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 175.75,
-        "y": 203,
-        "z": "111f91bb.269a56",
+        "x": 172.566650390625,
+        "y": 76,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "19d2750a.7ada53"
+                "3273c1f.6d67d3e"
             ]
         ]
     },
     {
-        "id": "19d2750a.7ada53",
+        "id": "3273c1f.6d67d3e",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3651 +201,3712 @@
         "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": 460.0356903076172,
-        "y": 264.23810863494873,
-        "z": "111f91bb.269a56",
+        "x": 456.8523406982422,
+        "y": 137.23810863494873,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "32b35910.0922e6"
+                "bc88585a.07ae"
             ]
         ]
     },
     {
-        "id": "32b35910.0922e6",
+        "id": "bc88585a.07ae",
         "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": 466.17860412597656,
-        "y": 349.0000305175781,
-        "z": "111f91bb.269a56",
+        "x": 462.99525451660156,
+        "y": 222.00003051757812,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "9f4c6f10.a708b"
+                "c722c351.6c9218"
             ]
         ]
     },
     {
-        "id": "9f4c6f10.a708b",
+        "id": "c722c351.6c9218",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 775.988037109375,
-        "y": 340.66668701171875,
-        "z": "111f91bb.269a56",
+        "x": 772.8046875,
+        "y": 213.66668701171875,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "b052f7e.a3d5288",
-                "14b40144.c74357",
-                "8371652a.c1422",
-                "ab74b4be.cbc48",
-                "77984a30.f32474"
+                "190659b8.bcae0e",
+                "faef4429.aa2c8",
+                "54215ea2.f0c928",
+                "8ba173b9.e36f",
+                "e82defb9.e02d8"
             ]
         ]
     },
     {
-        "id": "e58078ca.32c2b8",
+        "id": "5d0d530d.21fb2c",
         "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": 2033.75,
-        "y": 400,
-        "z": "111f91bb.269a56",
+        "x": 2030.566650390625,
+        "y": 273,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "bd448e7d.80d888",
+        "id": "6fabd371.f1d30c",
         "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": 4202.75,
-        "y": 286,
-        "z": "111f91bb.269a56",
+        "x": 4199.566650390625,
+        "y": 159,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "13f5ead.1dca895",
+        "id": "aa17cc43.b708b",
         "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": 4283.75,
-        "y": 601,
-        "z": "111f91bb.269a56",
+        "x": 4280.566650390625,
+        "y": 474,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "322b352.ceea84a",
-                "b686bcae.ff7c7"
+                "709fb1ba.ca1bd",
+                "a7a19ece.dc1ae"
             ]
         ]
     },
     {
-        "id": "322b352.ceea84a",
+        "id": "709fb1ba.ca1bd",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4593.25,
-        "y": 570,
-        "z": "111f91bb.269a56",
+        "x": 4590.066650390625,
+        "y": 443,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "1e1970be.0764a7"
+                "5cd036bd.ebcf28"
             ]
         ]
     },
     {
-        "id": "b686bcae.ff7c7",
+        "id": "a7a19ece.dc1ae",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4598.25,
-        "y": 635,
-        "z": "111f91bb.269a56",
+        "x": 4595.066650390625,
+        "y": 508,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "bd24692b.5a8508"
+                "fddf1c47.d3871"
             ]
         ]
     },
     {
-        "id": "1e1970be.0764a7",
+        "id": "5cd036bd.ebcf28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4769.25,
-        "y": 570,
-        "z": "111f91bb.269a56",
+        "x": 4766.066650390625,
+        "y": 443,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "bd24692b.5a8508",
+        "id": "fddf1c47.d3871",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4764.75,
-        "y": 635,
-        "z": "111f91bb.269a56",
+        "x": 4761.566650390625,
+        "y": 508,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "bdfec131.c9a298",
+        "id": "41b8dfa5.7b07b8",
         "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": 4148.25,
-        "y": 855,
-        "z": "111f91bb.269a56",
+        "x": 4145.066650390625,
+        "y": 728,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "68cdfef7.64c51",
+        "id": "a2bed09b.bd073",
         "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": 4302.25,
-        "y": 903,
-        "z": "111f91bb.269a56",
+        "x": 4299.066650390625,
+        "y": 776,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "534fa647.cdf3",
-                "626cbb12.a73134"
+                "8f1feb66.a203a8",
+                "bdea130f.d138e8"
             ]
         ]
     },
     {
-        "id": "534fa647.cdf3",
+        "id": "8f1feb66.a203a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4647.75,
-        "y": 884,
-        "z": "111f91bb.269a56",
+        "x": 4644.566650390625,
+        "y": 757,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "2db65967.f1a87e"
+                "2db058d.5e37da8"
             ]
         ]
     },
     {
-        "id": "626cbb12.a73134",
+        "id": "bdea130f.d138e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4651.75,
-        "y": 924,
-        "z": "111f91bb.269a56",
+        "x": 4648.566650390625,
+        "y": 797,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "54fc5ed8.18991"
+                "bfbb3301.3c3"
             ]
         ]
     },
     {
-        "id": "2db65967.f1a87e",
+        "id": "2db058d.5e37da8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4805.75,
-        "y": 884,
-        "z": "111f91bb.269a56",
+        "x": 4802.566650390625,
+        "y": 757,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "54fc5ed8.18991",
+        "id": "bfbb3301.3c3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4809.25,
-        "y": 924,
-        "z": "111f91bb.269a56",
+        "x": 4806.066650390625,
+        "y": 797,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "5bbebd3d.56e454",
-                "7821e9b0.59a868"
+                "737d402b.600cc",
+                "9643556e.80a7d8"
             ]
         ]
     },
     {
-        "id": "5bbebd3d.56e454",
+        "id": "737d402b.600cc",
         "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": 5139.75,
-        "y": 889,
-        "z": "111f91bb.269a56",
+        "x": 5136.566650390625,
+        "y": 762,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "72ed7974.8997",
+        "id": "340d03c1.bc10a4",
         "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": 5003.75,
-        "y": 848,
-        "z": "111f91bb.269a56",
+        "x": 5000.566650390625,
+        "y": 721,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "7821e9b0.59a868",
+        "id": "9643556e.80a7d8",
         "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": 5066.75,
-        "y": 935,
-        "z": "111f91bb.269a56",
+        "x": 5063.566650390625,
+        "y": 808,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "47a40348.350864",
+        "id": "3e996a09.c24c1e",
         "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": 4140.75,
-        "y": 334,
-        "z": "111f91bb.269a56",
+        "x": 4137.566650390625,
+        "y": 207,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "e86c4698.44de68",
+        "id": "73cd2276.fc690c",
         "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": 4166.75,
-        "y": 451,
-        "z": "111f91bb.269a56",
+        "x": 4163.566650390625,
+        "y": 324,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "3bef2a94.7a3c56",
-                "8e5e548f.b7d088",
-                "9e92c765.4c36e"
+                "2ce54c47.fa0e34",
+                "f2bf065e.86763",
+                "a6105f6e.dd58c"
             ]
         ]
     },
     {
-        "id": "3bef2a94.7a3c56",
+        "id": "2ce54c47.fa0e34",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4362.2501220703125,
-        "y": 403,
-        "z": "111f91bb.269a56",
+        "x": 4359.0667724609375,
+        "y": 276,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "8ae11b21.8072d"
+                "ed0df0d0.842f2"
             ]
         ]
     },
     {
-        "id": "8e5e548f.b7d088",
+        "id": "f2bf065e.86763",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4354.2501220703125,
-        "y": 458,
-        "z": "111f91bb.269a56",
+        "x": 4351.0667724609375,
+        "y": 331,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "85930301.e40178"
+                "40cafd9.39fe684"
             ]
         ]
     },
     {
-        "id": "8ae11b21.8072d",
+        "id": "ed0df0d0.842f2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4506.6324462890625,
-        "y": 402.6556701660156,
-        "z": "111f91bb.269a56",
+        "x": 4503.4490966796875,
+        "y": 275.6556701660156,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "2b001bb5.f3beac"
+                "404c86f.cf51c78"
             ]
         ]
     },
     {
-        "id": "44cbb5eb.fe11fc",
+        "id": "4841f833.0282b8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5088.75,
-        "y": 405,
-        "z": "111f91bb.269a56",
+        "x": 5085.566650390625,
+        "y": 278,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "8828c3a6.4773b"
+                "13a4c0ae.89b21f"
             ]
         ]
     },
     {
-        "id": "2b001bb5.f3beac",
+        "id": "404c86f.cf51c78",
         "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": 4690.75,
-        "y": 401,
-        "z": "111f91bb.269a56",
+        "x": 4687.566650390625,
+        "y": 274,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "e234651a.d8201"
+                "b62cc523.462948"
             ]
         ]
     },
     {
-        "id": "e234651a.d8201",
+        "id": "b62cc523.462948",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4885.75,
-        "y": 401,
-        "z": "111f91bb.269a56",
+        "x": 4882.566650390625,
+        "y": 274,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "44cbb5eb.fe11fc"
+                "4841f833.0282b8"
             ]
         ]
     },
     {
-        "id": "9e92c765.4c36e",
+        "id": "a6105f6e.dd58c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4359.2501220703125,
-        "y": 515,
-        "z": "111f91bb.269a56",
+        "x": 4356.0667724609375,
+        "y": 388,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "2e1c6b8c.8fd4dc"
+                "62b98530.ba575c"
             ]
         ]
     },
     {
-        "id": "2e1c6b8c.8fd4dc",
+        "id": "62b98530.ba575c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4511.2501220703125,
-        "y": 516,
-        "z": "111f91bb.269a56",
+        "x": 4508.0667724609375,
+        "y": 389,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "85930301.e40178",
+        "id": "40cafd9.39fe684",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4522.2501220703125,
-        "y": 459,
-        "z": "111f91bb.269a56",
+        "x": 4519.0667724609375,
+        "y": 332,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "90e4153e.8023d8",
+        "id": "ac0364e.0ddc498",
         "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": 5473.75,
-        "y": 418,
-        "z": "111f91bb.269a56",
+        "x": 5470.566650390625,
+        "y": 291,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "bac51d99.85cdd8",
-                "432bf875.253be8",
-                "32be30ae.8624b"
+                "52afc77f.66ed58",
+                "690d4481.5a01f4",
+                "561d9e01.bb6af8"
             ]
         ]
     },
     {
-        "id": "8828c3a6.4773b",
+        "id": "13a4c0ae.89b21f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5267.75,
-        "y": 405,
-        "z": "111f91bb.269a56",
+        "x": 5264.566650390625,
+        "y": 278,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "580b4f3c.2239f",
-                "90e4153e.8023d8"
+                "3f0e652f.aee95a",
+                "ac0364e.0ddc498"
             ]
         ]
     },
     {
-        "id": "580b4f3c.2239f",
+        "id": "3f0e652f.aee95a",
         "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": 5503.75,
-        "y": 366,
-        "z": "111f91bb.269a56",
+        "x": 5500.566650390625,
+        "y": 239,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "bac51d99.85cdd8",
+        "id": "52afc77f.66ed58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5683.75,
-        "y": 409,
-        "z": "111f91bb.269a56",
+        "x": 5680.566650390625,
+        "y": 282,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "7a8928ea.c03e88"
+                "2a8d9ba9.4de844"
             ]
         ]
     },
     {
-        "id": "432bf875.253be8",
+        "id": "690d4481.5a01f4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5675.75,
-        "y": 464,
-        "z": "111f91bb.269a56",
+        "x": 5672.566650390625,
+        "y": 337,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "609d607b.1ff68"
+                "54eb498f.c93a58"
             ]
         ]
     },
     {
-        "id": "32be30ae.8624b",
+        "id": "561d9e01.bb6af8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5680.75,
-        "y": 521,
-        "z": "111f91bb.269a56",
+        "x": 5677.566650390625,
+        "y": 394,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "e7f093f9.7ecc4"
+                "ab202d02.2d5188"
             ]
         ]
     },
     {
-        "id": "e7f093f9.7ecc4",
+        "id": "ab202d02.2d5188",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5832.75,
-        "y": 522,
-        "z": "111f91bb.269a56",
+        "x": 5829.566650390625,
+        "y": 395,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "609d607b.1ff68",
+        "id": "54eb498f.c93a58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5843.75,
-        "y": 467,
-        "z": "111f91bb.269a56",
+        "x": 5840.566650390625,
+        "y": 340,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "7a8928ea.c03e88",
+        "id": "2a8d9ba9.4de844",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5828.13232421875,
-        "y": 406.6556701660156,
-        "z": "111f91bb.269a56",
+        "x": 5824.948974609375,
+        "y": 279.6556701660156,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "d93996e8.177a9"
+                "fdb43e15.dd2458"
             ]
         ]
     },
     {
-        "id": "d93996e8.177a9",
+        "id": "fdb43e15.dd2458",
         "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": 6042.75,
-        "y": 403,
-        "z": "111f91bb.269a56",
+        "x": 6039.566650390625,
+        "y": 276,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "a51ca3ec.fcbd9",
+        "id": "ad465d2.36cfe2",
         "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": 3609.75,
-        "y": 1743,
-        "z": "111f91bb.269a56",
+        "x": 3606.566650390625,
+        "y": 1616,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "75a3839f.237ba4",
+        "id": "1622f07d.ae60d",
         "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": 3672.75,
-        "y": 2072,
-        "z": "111f91bb.269a56",
+        "x": 3669.566650390625,
+        "y": 1945,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "dce36923.840728",
-                "157f1852.8f7de8"
+                "e470471b.4d3ef",
+                "8ee5f8b0.1b5738"
             ]
         ]
     },
     {
-        "id": "dce36923.840728",
+        "id": "e470471b.4d3ef",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3968.25,
-        "y": 2039,
-        "z": "111f91bb.269a56",
+        "x": 3965.066650390625,
+        "y": 1912,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "c9eb5c3d.58ade8"
+                "fbda4868.d5b3c"
             ]
         ]
     },
     {
-        "id": "157f1852.8f7de8",
+        "id": "8ee5f8b0.1b5738",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3973.25,
-        "y": 2104,
-        "z": "111f91bb.269a56",
+        "x": 3970.066650390625,
+        "y": 1977,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ee455d7a.4369c"
+                "13ccd918.a15e2f"
             ]
         ]
     },
     {
-        "id": "c9eb5c3d.58ade8",
+        "id": "fbda4868.d5b3c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4136.25,
-        "y": 2039,
-        "z": "111f91bb.269a56",
+        "x": 4133.066650390625,
+        "y": 1912,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "ee455d7a.4369c",
+        "id": "13ccd918.a15e2f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4146.75,
-        "y": 2104,
-        "z": "111f91bb.269a56",
+        "x": 4143.566650390625,
+        "y": 1977,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "93204f2.1b4a73",
+        "id": "6aa679a5.fc13d8",
         "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": 3548.75,
-        "y": 1800,
-        "z": "111f91bb.269a56",
+        "x": 3545.566650390625,
+        "y": 1673,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "4ba3f303.c0a41c",
+        "id": "63f314c3.d2093c",
         "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": 3568.75,
-        "y": 1897,
-        "z": "111f91bb.269a56",
+        "x": 3565.566650390625,
+        "y": 1770,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "cb100a9c.e2d048",
-                "ffd6b507.6159d",
-                "7158557b.4eb374"
+                "cb2cd4ea.b10f5",
+                "da2dd809.2eaba8",
+                "b7e5de7f.bd9438"
             ]
         ]
     },
     {
-        "id": "cb100a9c.e2d048",
+        "id": "cb2cd4ea.b10f5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3771.2501220703125,
-        "y": 1850,
-        "z": "111f91bb.269a56",
+        "x": 3768.0667724609375,
+        "y": 1723,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "e6720bf0.83c908"
+                "92ce9c5d.eb149"
             ]
         ]
     },
     {
-        "id": "ffd6b507.6159d",
+        "id": "da2dd809.2eaba8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3763.2501220703125,
-        "y": 1905,
-        "z": "111f91bb.269a56",
+        "x": 3760.0667724609375,
+        "y": 1778,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "80e1f285.9bd438"
+                "d2833ad2.c8fbd8"
             ]
         ]
     },
     {
-        "id": "e6720bf0.83c908",
+        "id": "92ce9c5d.eb149",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3915.6324462890625,
-        "y": 1847.6556701660156,
-        "z": "111f91bb.269a56",
+        "x": 3912.4490966796875,
+        "y": 1720.6556701660156,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "62828788.5424"
+                "7c59c7e4.737078"
             ]
         ]
     },
     {
-        "id": "62828788.5424",
+        "id": "7c59c7e4.737078",
         "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": 4099.75,
-        "y": 1862,
-        "z": "111f91bb.269a56",
+        "x": 4096.566650390625,
+        "y": 1735,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "151698eb.d8b1bf"
+                "4a60b77a.b003e"
             ]
         ]
     },
     {
-        "id": "7158557b.4eb374",
+        "id": "b7e5de7f.bd9438",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3768.2501220703125,
-        "y": 1962,
-        "z": "111f91bb.269a56",
+        "x": 3765.0667724609375,
+        "y": 1835,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "4f499dcc.5ccf54"
+                "482f9215.08666c"
             ]
         ]
     },
     {
-        "id": "4f499dcc.5ccf54",
+        "id": "482f9215.08666c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3920.2501220703125,
-        "y": 1963,
-        "z": "111f91bb.269a56",
+        "x": 3917.0667724609375,
+        "y": 1836,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "80e1f285.9bd438",
+        "id": "d2833ad2.c8fbd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3931.2501220703125,
-        "y": 1908,
-        "z": "111f91bb.269a56",
+        "x": 3928.0667724609375,
+        "y": 1781,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "48500cb6.0a5974",
+        "id": "8251a2fe.8b6a98",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4497.75,
-        "y": 1866,
-        "z": "111f91bb.269a56",
+        "x": 4494.566650390625,
+        "y": 1739,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "9253635.59581a"
+                "3fea75ef.6caa7a"
             ]
         ]
     },
     {
-        "id": "151698eb.d8b1bf",
+        "id": "4a60b77a.b003e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4294.75,
-        "y": 1862,
-        "z": "111f91bb.269a56",
+        "x": 4291.566650390625,
+        "y": 1735,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "48500cb6.0a5974"
+                "8251a2fe.8b6a98"
             ]
         ]
     },
     {
-        "id": "a71424bd.8e0678",
+        "id": "49b53839.01783",
         "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": 4882.75,
-        "y": 1865,
-        "z": "111f91bb.269a56",
+        "x": 4879.566650390625,
+        "y": 1738,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "a7626fee.35776",
-                "f55d0ed2.02e038",
-                "47407f5a.98f7f8"
+                "b2b3032.264fd8",
+                "373b81c5.683f3e",
+                "869370b9.925f48"
             ]
         ]
     },
     {
-        "id": "9253635.59581a",
+        "id": "3fea75ef.6caa7a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4674.75,
-        "y": 1858,
-        "z": "111f91bb.269a56",
+        "x": 4671.566650390625,
+        "y": 1731,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "3d578b8.a79bc74",
-                "a71424bd.8e0678"
+                "dd88623a.123e",
+                "49b53839.01783"
             ]
         ]
     },
     {
-        "id": "3d578b8.a79bc74",
+        "id": "dd88623a.123e",
         "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": 4912.75,
-        "y": 1813,
-        "z": "111f91bb.269a56",
+        "x": 4909.566650390625,
+        "y": 1686,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "d6ea76ec.6a17f8",
+        "id": "8fb4dcc3.25c568",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5241.75,
-        "y": 1969,
-        "z": "111f91bb.269a56",
+        "x": 5238.566650390625,
+        "y": 1842,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "2c34e3d1.56f314",
+        "id": "95a386c5.a58638",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5252.75,
-        "y": 1914,
-        "z": "111f91bb.269a56",
+        "x": 5249.566650390625,
+        "y": 1787,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "fae51f86.36cbd8",
+        "id": "738801a1.4d047",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5237.13232421875,
-        "y": 1853.6556701660156,
-        "z": "111f91bb.269a56",
+        "x": 5233.948974609375,
+        "y": 1726.6556701660156,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "e7fe4b79.28daf8"
+                "710bce1a.dc395"
             ]
         ]
     },
     {
-        "id": "e7fe4b79.28daf8",
+        "id": "710bce1a.dc395",
         "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": 5451.75,
-        "y": 1850,
-        "z": "111f91bb.269a56",
+        "x": 5448.566650390625,
+        "y": 1723,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "a7626fee.35776",
+        "id": "b2b3032.264fd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5092.75,
-        "y": 1856,
-        "z": "111f91bb.269a56",
+        "x": 5089.566650390625,
+        "y": 1729,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "fae51f86.36cbd8"
+                "738801a1.4d047"
             ]
         ]
     },
     {
-        "id": "f55d0ed2.02e038",
+        "id": "373b81c5.683f3e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5084.75,
-        "y": 1911,
-        "z": "111f91bb.269a56",
+        "x": 5081.566650390625,
+        "y": 1784,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "2c34e3d1.56f314"
+                "95a386c5.a58638"
             ]
         ]
     },
     {
-        "id": "47407f5a.98f7f8",
+        "id": "869370b9.925f48",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5089.75,
-        "y": 1968,
-        "z": "111f91bb.269a56",
+        "x": 5086.566650390625,
+        "y": 1841,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "d6ea76ec.6a17f8"
+                "8fb4dcc3.25c568"
             ]
         ]
     },
     {
-        "id": "3dd6564a.788bea",
+        "id": "60036337.4eba24",
         "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": 3123.75,
-        "y": 814,
-        "z": "111f91bb.269a56",
+        "x": 3120.566650390625,
+        "y": 687,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "4498685c.f8a9c8",
-                "ce59ca85.515708"
+                "3dc5eab6.536eee",
+                "c84ae496.428be8"
             ]
         ]
     },
     {
-        "id": "4498685c.f8a9c8",
+        "id": "3dc5eab6.536eee",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3337.75,
-        "y": 851,
-        "z": "111f91bb.269a56",
+        "x": 3334.566650390625,
+        "y": 724,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "b9aa4ba2.44d89"
+                "20d6afb2.5423d"
             ]
         ]
     },
     {
-        "id": "ce59ca85.515708",
+        "id": "c84ae496.428be8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3339.75,
-        "y": 789,
-        "z": "111f91bb.269a56",
+        "x": 3336.566650390625,
+        "y": 662,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "50bc7adf.71a1d4"
+                "c6c4710b.3b446"
             ]
         ]
     },
     {
-        "id": "b9aa4ba2.44d89",
+        "id": "20d6afb2.5423d",
         "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": 2917.75,
-        "y": 2094,
-        "z": "111f91bb.269a56",
+        "x": 2914.566650390625,
+        "y": 1967,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "28dcb01c.f45e6",
-                "415698c1.9dad18"
+                "f7e1076.b120ff8",
+                "38975d3e.e2ea2a"
             ]
         ]
     },
     {
-        "id": "28dcb01c.f45e6",
+        "id": "f7e1076.b120ff8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3170.75,
-        "y": 2128,
-        "z": "111f91bb.269a56",
+        "x": 3167.566650390625,
+        "y": 2001,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "8cf945af.2f52c8"
+                "6af8dbb6.a59b4c"
             ]
         ]
     },
     {
-        "id": "415698c1.9dad18",
+        "id": "38975d3e.e2ea2a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3170.75,
-        "y": 2072,
-        "z": "111f91bb.269a56",
+        "x": 3167.566650390625,
+        "y": 1945,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "c8aba811.103238"
+                "2e5f8334.fd5e8c"
             ]
         ]
     },
     {
-        "id": "8cf945af.2f52c8",
+        "id": "6af8dbb6.a59b4c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3321.75,
-        "y": 2128,
-        "z": "111f91bb.269a56",
+        "x": 3318.566650390625,
+        "y": 2001,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "eb2e2de2.a53528",
+        "id": "d2d4d90e.2fae",
         "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": 4197.75,
-        "y": 226,
-        "z": "111f91bb.269a56",
+        "x": 4194.566650390625,
+        "y": 99,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "15f47b8b.7e00dc",
+        "id": "33cb0d0f.4dfe6a",
         "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": 3605.75,
-        "y": 1685,
-        "z": "111f91bb.269a56",
+        "x": 3602.566650390625,
+        "y": 1558,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "9c2c3c17.6c4b68",
+        "id": "d855f72b.7e86a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3888.75,
-        "y": 483,
-        "z": "111f91bb.269a56",
+        "x": 3885.566650390625,
+        "y": 356,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "eb2e2de2.a53528",
-                "bd448e7d.80d888",
-                "47a40348.350864",
-                "e86c4698.44de68",
-                "13f5ead.1dca895",
-                "94ce35b5.84e9d",
-                "9dbb6108.db3f08",
-                "7f10b67d.13cbf"
+                "d2d4d90e.2fae",
+                "6fabd371.f1d30c",
+                "3e996a09.c24c1e",
+                "73cd2276.fc690c",
+                "aa17cc43.b708b",
+                "2774aa91.aa9f06",
+                "8954306d.3c458",
+                "d41278c1.0e8268"
             ]
         ]
     },
     {
-        "id": "c8aba811.103238",
+        "id": "2e5f8334.fd5e8c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3321.75,
-        "y": 2071,
-        "z": "111f91bb.269a56",
+        "x": 3318.566650390625,
+        "y": 1944,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "15f47b8b.7e00dc",
-                "a51ca3ec.fcbd9",
-                "93204f2.1b4a73",
-                "4ba3f303.c0a41c",
-                "75a3839f.237ba4",
-                "b13189f3.5c00c",
-                "72e7ea14.321c0c",
-                "a1c10f72.410b08"
+                "33cb0d0f.4dfe6a",
+                "ad465d2.36cfe2",
+                "6aa679a5.fc13d8",
+                "63f314c3.d2093c",
+                "1622f07d.ae60d",
+                "2d0bf44f.d7a87c",
+                "745353ea.a7c82c",
+                "a43e9ba4.30fe8"
             ]
         ]
     },
     {
-        "id": "30be8f1c.c2c68",
+        "id": "ea6929ec.54f7c8",
         "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": 3559.75,
-        "y": 2370,
-        "z": "111f91bb.269a56",
+        "x": 3556.566650390625,
+        "y": 2243,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "60d95124.1573e8",
+        "id": "5471fe10.85fa48",
         "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": 3713.75,
-        "y": 2418,
-        "z": "111f91bb.269a56",
+        "x": 3710.566650390625,
+        "y": 2291,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "626c41a5.4a556",
-                "319f7c4c.700584"
+                "709844dc.12b89c",
+                "36a6ddd8.c214a2"
             ]
         ]
     },
     {
-        "id": "626c41a5.4a556",
+        "id": "709844dc.12b89c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4059.25,
-        "y": 2399,
-        "z": "111f91bb.269a56",
+        "x": 4056.066650390625,
+        "y": 2272,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "a16c0d6b.aa021"
+                "b6a9b933.1ec16"
             ]
         ]
     },
     {
-        "id": "319f7c4c.700584",
+        "id": "36a6ddd8.c214a2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4063.25,
-        "y": 2439,
-        "z": "111f91bb.269a56",
+        "x": 4060.066650390625,
+        "y": 2312,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "c46066f7.6ad638"
+                "ef6de723.b6fb38"
             ]
         ]
     },
     {
-        "id": "a16c0d6b.aa021",
+        "id": "b6a9b933.1ec16",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4217.25,
-        "y": 2399,
-        "z": "111f91bb.269a56",
+        "x": 4214.066650390625,
+        "y": 2272,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "c46066f7.6ad638",
+        "id": "ef6de723.b6fb38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4220.75,
-        "y": 2439,
-        "z": "111f91bb.269a56",
+        "x": 4217.566650390625,
+        "y": 2312,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "dbf72bce.fe4fd",
-                "da41ce10.71c4a8"
+                "dffbfe56.944988",
+                "8e76351f.3450b"
             ]
         ]
     },
     {
-        "id": "dbf72bce.fe4fd",
+        "id": "dffbfe56.944988",
         "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": 4560.75,
-        "y": 2438,
-        "z": "111f91bb.269a56",
+        "x": 4557.566650390625,
+        "y": 2311,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "a0a6a7a2.80538",
+        "id": "a2006b0c.836e18",
         "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": 4418.75,
-        "y": 2396,
-        "z": "111f91bb.269a56",
+        "x": 4415.566650390625,
+        "y": 2269,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "da41ce10.71c4a8",
+        "id": "8e76351f.3450b",
         "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": 4489.75,
-        "y": 2487,
-        "z": "111f91bb.269a56",
+        "x": 4486.566650390625,
+        "y": 2360,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "509b9ad8.503f2c",
+        "id": "43b4f3be.c07abc",
         "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": 3114.75,
-        "y": 754,
-        "z": "111f91bb.269a56",
+        "x": 3111.566650390625,
+        "y": 627,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "8edfc4cd.8a0528",
+        "id": "a5929ea4.d560e8",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3709.75,
-        "y": 440,
-        "z": "111f91bb.269a56",
+        "x": 3706.566650390625,
+        "y": 313,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "f79b26c9.540128",
+        "id": "40338a80.0ff774",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3266.75,
-        "y": 2018,
-        "z": "111f91bb.269a56",
+        "x": 3263.566650390625,
+        "y": 1891,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "50bc7adf.71a1d4",
+        "id": "c6c4710b.3b446",
         "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": 3445.75,
-        "y": 602,
-        "z": "111f91bb.269a56",
+        "x": 3442.566650390625,
+        "y": 475,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ebf4cc93.93ec7",
-                "8e7f6f60.66ae28"
+                "8c077d56.2d05a8",
+                "47f9e9e4.4ae948"
             ]
         ]
     },
     {
-        "id": "8e7f6f60.66ae28",
+        "id": "47f9e9e4.4ae948",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3687.75,
-        "y": 1191,
-        "z": "111f91bb.269a56",
+        "x": 3684.566650390625,
+        "y": 1064,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "d55e670.1fa9f18"
+                "32d70917.41b9b6"
             ]
         ]
     },
     {
-        "id": "ebf4cc93.93ec7",
+        "id": "8c077d56.2d05a8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3681.75,
-        "y": 482,
-        "z": "111f91bb.269a56",
+        "x": 3678.566650390625,
+        "y": 355,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "9c2c3c17.6c4b68"
+                "d855f72b.7e86a8"
             ]
         ]
     },
     {
-        "id": "d55e670.1fa9f18",
+        "id": "32d70917.41b9b6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3845.75,
-        "y": 1190,
-        "z": "111f91bb.269a56",
+        "x": 3842.566650390625,
+        "y": 1063,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "f4e2a19a.1a35e",
-                "f86044a9.f193d",
-                "4b4e2775.d6044",
-                "86690982.b14b6",
-                "21d875df.4e5d92",
-                "971d8a82.30a53"
+                "ab9c9477.87e1",
+                "16a44de.db79032",
+                "42cda8d6.66eab8",
+                "aab7a1d7.f682c8",
+                "43e0f21e.8328e4",
+                "173252a4.3c7835"
             ]
         ]
     },
     {
-        "id": "f86044a9.f193d",
+        "id": "16a44de.db79032",
         "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": 4109.75,
-        "y": 1073,
-        "z": "111f91bb.269a56",
+        "x": 4106.566650390625,
+        "y": 946,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "21d875df.4e5d92",
+        "id": "43e0f21e.8328e4",
         "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": 4190.75,
-        "y": 1388,
-        "z": "111f91bb.269a56",
+        "x": 4187.566650390625,
+        "y": 1261,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "cd1830a.9a25b5",
-                "5f7c3883.6456e"
+                "ecdb1dc3.601aa",
+                "9e4afd98.6cdb48"
             ]
         ]
     },
     {
-        "id": "cd1830a.9a25b5",
+        "id": "ecdb1dc3.601aa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4500.25,
-        "y": 1357,
-        "z": "111f91bb.269a56",
+        "x": 4497.066650390625,
+        "y": 1230,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "cf35e2b3.2c8468"
+                "111350dc.469227"
             ]
         ]
     },
     {
-        "id": "5f7c3883.6456e",
+        "id": "9e4afd98.6cdb48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4505.25,
-        "y": 1422,
-        "z": "111f91bb.269a56",
+        "x": 4502.066650390625,
+        "y": 1295,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "b3a80e08.d037b"
+                "c6b74dac.622de"
             ]
         ]
     },
     {
-        "id": "cf35e2b3.2c8468",
+        "id": "111350dc.469227",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4676.25,
-        "y": 1357,
-        "z": "111f91bb.269a56",
+        "x": 4673.066650390625,
+        "y": 1230,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "b3a80e08.d037b",
+        "id": "c6b74dac.622de",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4671.75,
-        "y": 1422,
-        "z": "111f91bb.269a56",
+        "x": 4668.566650390625,
+        "y": 1295,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b4e2775.d6044",
+        "id": "42cda8d6.66eab8",
         "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": 4047.75,
-        "y": 1121,
-        "z": "111f91bb.269a56",
+        "x": 4044.566650390625,
+        "y": 994,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "86690982.b14b6",
+        "id": "aab7a1d7.f682c8",
         "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": 4073.75,
-        "y": 1238,
-        "z": "111f91bb.269a56",
+        "x": 4070.566650390625,
+        "y": 1111,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "85fe6961.6a7908",
-                "3fb6fcbe.a3fa0c",
-                "89e44c19.cf1b38"
+                "fc77fdb3.27d7c",
+                "3d52c0ff.052c58",
+                "d66dde94.6fdfd8"
             ]
         ]
     },
     {
-        "id": "85fe6961.6a7908",
+        "id": "fc77fdb3.27d7c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4269.2501220703125,
-        "y": 1190,
-        "z": "111f91bb.269a56",
+        "x": 4266.0667724609375,
+        "y": 1063,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "8a104557.0ad8d8"
+                "6a6dadc5.106a64"
             ]
         ]
     },
     {
-        "id": "3fb6fcbe.a3fa0c",
+        "id": "3d52c0ff.052c58",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4261.2501220703125,
-        "y": 1245,
-        "z": "111f91bb.269a56",
+        "x": 4258.0667724609375,
+        "y": 1118,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "42db739a.3307d4"
+                "6a18bc26.5dd68c"
             ]
         ]
     },
     {
-        "id": "8a104557.0ad8d8",
+        "id": "6a6dadc5.106a64",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4413.6324462890625,
-        "y": 1189.6556701660156,
-        "z": "111f91bb.269a56",
+        "x": 4410.4490966796875,
+        "y": 1062.6556701660156,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "f760615b.c41c38"
+                "abd6aa97.319628"
             ]
         ]
     },
     {
-        "id": "f760615b.c41c38",
+        "id": "abd6aa97.319628",
         "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": 4597.75,
-        "y": 1188,
-        "z": "111f91bb.269a56",
+        "x": 4594.566650390625,
+        "y": 1061,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "142416ba.388749"
+                "d45837ad.7cfdd"
             ]
         ]
     },
     {
-        "id": "142416ba.388749",
+        "id": "d45837ad.7cfdd",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4792.75,
-        "y": 1188,
-        "z": "111f91bb.269a56",
+        "x": 4789.566650390625,
+        "y": 1061,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ee80fb82.914478"
+                "56faad34.523464"
             ]
         ]
     },
     {
-        "id": "89e44c19.cf1b38",
+        "id": "d66dde94.6fdfd8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4266.2501220703125,
-        "y": 1302,
-        "z": "111f91bb.269a56",
+        "x": 4263.0667724609375,
+        "y": 1175,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "190fd174.e420e7"
+                "da706f47.bc937"
             ]
         ]
     },
     {
-        "id": "190fd174.e420e7",
+        "id": "da706f47.bc937",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4418.2501220703125,
-        "y": 1303,
-        "z": "111f91bb.269a56",
+        "x": 4415.0667724609375,
+        "y": 1176,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "42db739a.3307d4",
+        "id": "6a18bc26.5dd68c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4429.2501220703125,
-        "y": 1246,
-        "z": "111f91bb.269a56",
+        "x": 4426.0667724609375,
+        "y": 1119,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "f4e2a19a.1a35e",
+        "id": "ab9c9477.87e1",
         "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": 4104.75,
-        "y": 1013,
-        "z": "111f91bb.269a56",
+        "x": 4101.566650390625,
+        "y": 886,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "ee80fb82.914478",
+        "id": "56faad34.523464",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4995.75,
-        "y": 1192,
-        "z": "111f91bb.269a56",
+        "x": 4992.566650390625,
+        "y": 1065,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "16f58788.f805f"
+                "30b949db.4c7a16"
             ]
         ]
     },
     {
-        "id": "4337aa6a.e7854c",
+        "id": "df7b95f6.393d48",
         "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": 5380.75,
-        "y": 1205,
-        "z": "111f91bb.269a56",
+        "x": 5377.566650390625,
+        "y": 1078,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "d59e46ba.4f5ed8",
-                "51e7728a.8676fc",
-                "dbdd6c65.aefc38"
+                "166f182a.55dd48",
+                "e1871eda.62c8a8",
+                "b691673d.bc8c3"
             ]
         ]
     },
     {
-        "id": "16f58788.f805f",
+        "id": "30b949db.4c7a16",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5174.75,
-        "y": 1192,
-        "z": "111f91bb.269a56",
+        "x": 5171.566650390625,
+        "y": 1065,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "925f4411.b3c5c",
-                "4337aa6a.e7854c"
+                "5671583d.41ed78",
+                "df7b95f6.393d48"
             ]
         ]
     },
     {
-        "id": "925f4411.b3c5c",
+        "id": "5671583d.41ed78",
         "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": 5410.75,
-        "y": 1153,
-        "z": "111f91bb.269a56",
+        "x": 5407.566650390625,
+        "y": 1026,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "d59e46ba.4f5ed8",
+        "id": "166f182a.55dd48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5590.75,
-        "y": 1196,
-        "z": "111f91bb.269a56",
+        "x": 5587.566650390625,
+        "y": 1069,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "9fb3d6ee.612538"
+                "61f2e54a.d8bfcc"
             ]
         ]
     },
     {
-        "id": "51e7728a.8676fc",
+        "id": "e1871eda.62c8a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5582.75,
-        "y": 1251,
-        "z": "111f91bb.269a56",
+        "x": 5579.566650390625,
+        "y": 1124,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "1c483cb2.44cb23"
+                "95391466.b0fdc8"
             ]
         ]
     },
     {
-        "id": "dbdd6c65.aefc38",
+        "id": "b691673d.bc8c3",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5587.75,
-        "y": 1308,
-        "z": "111f91bb.269a56",
+        "x": 5584.566650390625,
+        "y": 1181,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "c131e872.bad5c8"
+                "eaaeed8c.dbf45"
             ]
         ]
     },
     {
-        "id": "c131e872.bad5c8",
+        "id": "eaaeed8c.dbf45",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5739.75,
-        "y": 1309,
-        "z": "111f91bb.269a56",
+        "x": 5736.566650390625,
+        "y": 1182,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "1c483cb2.44cb23",
+        "id": "95391466.b0fdc8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5750.75,
-        "y": 1254,
-        "z": "111f91bb.269a56",
+        "x": 5747.566650390625,
+        "y": 1127,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "9fb3d6ee.612538",
+        "id": "61f2e54a.d8bfcc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5735.13232421875,
-        "y": 1193.6556701660156,
-        "z": "111f91bb.269a56",
+        "x": 5731.948974609375,
+        "y": 1066.6556701660156,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "e9716a08.a0ba08"
+                "573ef3d8.3e7cf4"
             ]
         ]
     },
     {
-        "id": "e9716a08.a0ba08",
+        "id": "573ef3d8.3e7cf4",
         "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": 5949.75,
-        "y": 1190,
-        "z": "111f91bb.269a56",
+        "x": 5946.566650390625,
+        "y": 1063,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "c1f0320d.223f",
+        "id": "2171f884.ea7ea8",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3723.75,
-        "y": 1131,
-        "z": "111f91bb.269a56",
+        "x": 3720.566650390625,
+        "y": 1004,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "db55a5db.cc9e2",
+        "id": "d6a4c941.f116b8",
         "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": 2285.75,
-        "y": 858,
-        "z": "111f91bb.269a56",
+        "x": 2282.566650390625,
+        "y": 731,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "8cfca669.4c31d",
-                "1cedd7fb.e18cd"
+                "49267234.da4bac",
+                "c034393e.41c88"
             ]
         ]
     },
     {
-        "id": "1cedd7fb.e18cd",
+        "id": "c034393e.41c88",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692.75,
-        "y": 876,
-        "z": "111f91bb.269a56",
+        "x": 2689.566650390625,
+        "y": 749,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "91bf0188.93b52"
+                "bc6b2cdd.907e6"
             ]
         ]
     },
     {
-        "id": "8cfca669.4c31d",
+        "id": "49267234.da4bac",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692.75,
-        "y": 821,
-        "z": "111f91bb.269a56",
+        "x": 2689.566650390625,
+        "y": 694,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "6ae8a7fa.83375"
+                "1c258f4d.ef4741"
             ]
         ]
     },
     {
-        "id": "6ae8a7fa.83375",
+        "id": "1c258f4d.ef4741",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2848.75,
-        "y": 819,
-        "z": "111f91bb.269a56",
+        "x": 2845.566650390625,
+        "y": 692,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "509b9ad8.503f2c",
-                "3dd6564a.788bea"
+                "43b4f3be.c07abc",
+                "60036337.4eba24"
             ]
         ]
     },
     {
-        "id": "91bf0188.93b52",
+        "id": "bc6b2cdd.907e6",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2825.75,
-        "y": 877,
-        "z": "111f91bb.269a56",
+        "x": 2822.566650390625,
+        "y": 750,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "14b40144.c74357",
+        "id": "faef4429.aa2c8",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 1002.75,
-        "y": 293,
-        "z": "111f91bb.269a56",
+        "x": 999.566650390625,
+        "y": 166,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "470acf69.6a7218",
+        "id": "cda219ec.f988b",
         "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": 4119.75,
-        "y": 711,
-        "z": "111f91bb.269a56",
+        "x": 4116.566650390625,
+        "y": 584,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "94ce35b5.84e9d",
+        "id": "2774aa91.aa9f06",
         "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": 4179.75,
-        "y": 750,
-        "z": "111f91bb.269a56",
+        "x": 4176.566650390625,
+        "y": 623,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "8371652a.c1422",
+        "id": "54215ea2.f0c928",
         "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": 995.75,
-        "y": 201,
-        "z": "111f91bb.269a56",
+        "x": 992.566650390625,
+        "y": 74,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "180e951c.adb823",
+        "id": "96b9a282.e630c",
         "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": 3531.75,
-        "y": 2227,
-        "z": "111f91bb.269a56",
+        "x": 3528.566650390625,
+        "y": 2100,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "b13189f3.5c00c",
+        "id": "2d0bf44f.d7a87c",
         "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": 3587.75,
-        "y": 2276,
-        "z": "111f91bb.269a56",
+        "x": 3584.566650390625,
+        "y": 2149,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "68b96268.5bf0d4",
+        "id": "5152a0e6.713128",
         "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": 995.75,
-        "y": 240,
-        "z": "111f91bb.269a56",
+        "x": 992.566650390625,
+        "y": 113,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "ab74b4be.cbc48",
+        "id": "8ba173b9.e36f",
         "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": 1026.75,
-        "y": 341,
-        "z": "111f91bb.269a56",
+        "x": 1023.566650390625,
+        "y": 214,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "77984a30.f32474",
+        "id": "e82defb9.e02d8",
         "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": 236.75,
-        "y": 816,
-        "z": "111f91bb.269a56",
+        "x": 233.566650390625,
+        "y": 689,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "6b466955.39f7e8",
-                "ea72fa7a.37647",
-                "256cca7a.4ba78e"
+                "2d5a1d5b.838492",
+                "889991f3.032d8",
+                "b5db494f.57cef8"
             ]
         ]
     },
     {
-        "id": "6b466955.39f7e8",
+        "id": "2d5a1d5b.838492",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 455.75,
-        "y": 754,
-        "z": "111f91bb.269a56",
+        "x": 452.566650390625,
+        "y": 627,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ff154227.b5783"
+                "438119f5.89426"
             ]
         ]
     },
     {
-        "id": "ea72fa7a.37647",
+        "id": "889991f3.032d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 465.240966796875,
-        "y": 796.5740356445312,
-        "z": "111f91bb.269a56",
+        "x": 462.0576171875,
+        "y": 669.5740356445312,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "256cca7a.4ba78e",
+        "id": "b5db494f.57cef8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 453.75,
-        "y": 843,
-        "z": "111f91bb.269a56",
+        "x": 450.566650390625,
+        "y": 716,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "9c1b438c.70f6e8"
+                "debce4b9.8571d"
             ]
         ]
     },
     {
-        "id": "ff154227.b5783",
+        "id": "438119f5.89426",
         "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": 652.75,
-        "y": 750,
-        "z": "111f91bb.269a56",
+        "x": 649.566650390625,
+        "y": 623,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "d19cd8ca.093408"
+                "e1b02bed.ab2ac8"
             ]
         ]
     },
     {
-        "id": "9c1b438c.70f6e8",
+        "id": "debce4b9.8571d",
         "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.75,
-        "y": 844,
-        "z": "111f91bb.269a56",
+        "x": 619.566650390625,
+        "y": 717,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "d19cd8ca.093408",
+        "id": "e1b02bed.ab2ac8",
         "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": 876.08349609375,
-        "y": 749.9999389648438,
-        "z": "111f91bb.269a56",
+        "x": 872.900146484375,
+        "y": 622.9999389648438,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ec3530b4.60943"
+                "e03ee0c1.da854"
             ]
         ]
     },
     {
-        "id": "ec3530b4.60943",
+        "id": "e03ee0c1.da854",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1076.7501335144043,
-        "y": 751.000020980835,
-        "z": "111f91bb.269a56",
+        "x": 1073.5667839050293,
+        "y": 624.000020980835,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "732a5938.51aee8"
+                "c4a6ee39.d82118"
             ]
         ]
     },
     {
-        "id": "732a5938.51aee8",
+        "id": "c4a6ee39.d82118",
         "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": 206.75,
-        "y": 1013,
-        "z": "111f91bb.269a56",
+        "x": 203.566650390625,
+        "y": 886,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "23a8b591.9364c2",
-                "8c7cc41e.285ad",
-                "a093cec4.b44ed"
+                "7634ec98.e6038c",
+                "916099a4.9dccf",
+                "c850e0b6.e35a68"
             ]
         ]
     },
     {
-        "id": "23a8b591.9364c2",
+        "id": "7634ec98.e6038c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 414.75,
-        "y": 977,
-        "z": "111f91bb.269a56",
+        "x": 411.566650390625,
+        "y": 850,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "9b9627ac.373dc8"
+                "33f1fe4a.c9d6f2"
             ]
         ]
     },
     {
-        "id": "8c7cc41e.285ad",
+        "id": "916099a4.9dccf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 415.240966796875,
-        "y": 1022.5740356445312,
-        "z": "111f91bb.269a56",
+        "x": 412.0576171875,
+        "y": 895.5740356445312,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "a093cec4.b44ed",
+        "id": "c850e0b6.e35a68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 412.75,
-        "y": 1066,
-        "z": "111f91bb.269a56",
+        "x": 409.566650390625,
+        "y": 939,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "26fe918.5a2edee"
+                "76c84cf.6c8b334"
             ]
         ]
     },
     {
-        "id": "26fe918.5a2edee",
+        "id": "76c84cf.6c8b334",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 581.75,
-        "y": 1067,
-        "z": "111f91bb.269a56",
+        "x": 578.566650390625,
+        "y": 940,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "f6f3f7dd.ddd42",
+        "id": "d82baf7f.56b2f",
         "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": 553.75,
-        "y": 1561,
-        "z": "111f91bb.269a56",
+        "x": 550.566650390625,
+        "y": 1434,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "8744e477.6cb05"
+                "3c41a0c0.d2817"
             ]
         ]
     },
     {
-        "id": "8744e477.6cb05",
+        "id": "3c41a0c0.d2817",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 756.75,
-        "y": 1573,
-        "z": "111f91bb.269a56",
+        "x": 753.566650390625,
+        "y": 1446,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "9fc39c57.082728"
+                "24edffac.eaf52"
             ]
         ]
     },
     {
-        "id": "9fc39c57.082728",
+        "id": "24edffac.eaf52",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 922.75,
-        "y": 1570,
-        "z": "111f91bb.269a56",
+        "x": 919.566650390625,
+        "y": 1443,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "5d341323.92886c"
+                "8767ddb8.be5188"
             ]
         ]
     },
     {
-        "id": "5d341323.92886c",
+        "id": "8767ddb8.be5188",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1083.75,
-        "y": 1567,
-        "z": "111f91bb.269a56",
+        "x": 1080.566650390625,
+        "y": 1440,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "878fc20b.33088",
-                "9a421f91.9b1b28",
-                "7916417b.dd4858",
-                "277d0a08.b51776",
-                "5d833ac3.a3e554",
-                "6bd95e1e.6c91d8"
+                "acad8b74.fa56d8",
+                "31574f1b.e35268",
+                "9a0e95d9.2f80c",
+                "559bb9d.67d2e48",
+                "d55a6f33.2c1388",
+                "bc764283.2e9fd8"
             ]
         ]
     },
     {
-        "id": "9a421f91.9b1b28",
+        "id": "31574f1b.e35268",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1289.75,
-        "y": 1166.9999389648438,
-        "z": "111f91bb.269a56",
+        "x": 1286.566650390625,
+        "y": 1039.9999389648438,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "878fc20b.33088",
+        "id": "acad8b74.fa56d8",
         "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": 1286.75,
-        "y": 1211.9999389648438,
-        "z": "111f91bb.269a56",
+        "x": 1283.566650390625,
+        "y": 1084.9999389648438,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "1277502d.c8e7a",
-                "3575cdbd.1f32e2",
-                "bad103b9.14ac5"
+                "1904c12b.d430cf",
+                "4ab95198.c6613",
+                "5a08d5cf.278d24"
             ]
         ]
     },
     {
-        "id": "3575cdbd.1f32e2",
+        "id": "4ab95198.c6613",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1482.240966796875,
-        "y": 1185.5739135742188,
-        "z": "111f91bb.269a56",
+        "x": 1479.0576171875,
+        "y": 1058.5739135742188,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "245198ca.86efd8"
+                "ba7aa021.45bdf8"
             ]
         ]
     },
     {
-        "id": "bad103b9.14ac5",
+        "id": "5a08d5cf.278d24",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1477.75,
-        "y": 1229.9998779296875,
-        "z": "111f91bb.269a56",
+        "x": 1474.566650390625,
+        "y": 1102.9998779296875,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "564cd01d.c60fe8"
+                "785f1788.92249"
             ]
         ]
     },
     {
-        "id": "245198ca.86efd8",
+        "id": "ba7aa021.45bdf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1644.8125,
-        "y": 1184.859619140625,
-        "z": "111f91bb.269a56",
+        "x": 1641.629150390625,
+        "y": 1057.859619140625,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "564cd01d.c60fe8",
+        "id": "785f1788.92249",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1645.75,
-        "y": 1229.9998779296875,
-        "z": "111f91bb.269a56",
+        "x": 1642.566650390625,
+        "y": 1102.9998779296875,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "57d2d0ba.ac96f",
+        "id": "cc679883.b7f1b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1647.75,
-        "y": 1276.9998779296875,
-        "z": "111f91bb.269a56",
+        "x": 1644.566650390625,
+        "y": 1149.9998779296875,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "1277502d.c8e7a",
+        "id": "1904c12b.d430cf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1478.75,
-        "y": 1276.9998779296875,
-        "z": "111f91bb.269a56",
+        "x": 1475.566650390625,
+        "y": 1149.9998779296875,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "57d2d0ba.ac96f"
+                "cc679883.b7f1b8"
             ]
         ]
     },
     {
-        "id": "5f14d939.b7d6d",
+        "id": "1a421455.86d86c",
         "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": 1260.75,
-        "y": 1798,
-        "z": "111f91bb.269a56",
+        "x": 1257.566650390625,
+        "y": 1671,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "7916417b.dd4858",
+        "id": "9a0e95d9.2f80c",
         "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": 1351.75,
-        "y": 1852,
-        "z": "111f91bb.269a56",
+        "x": 1348.566650390625,
+        "y": 1725,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "780a0f58.bba71",
+        "id": "62fb7c08.30d35c",
         "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": 2028.25,
-        "y": 1265,
-        "z": "111f91bb.269a56",
+        "x": 2025.066650390625,
+        "y": 1138,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "423abc5f.68ffa4",
+        "id": "b56049ef.636ab",
         "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": 2033.25,
-        "y": 1367,
-        "z": "111f91bb.269a56",
+        "x": 2030.066650390625,
+        "y": 1240,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "9ae45b75.53fe1",
+        "id": "513cbd5b.994ffc",
         "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": 516.75,
-        "y": 1817,
-        "z": "111f91bb.269a56",
+        "x": 513.566650390625,
+        "y": 1690,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "a1c491a.b9e1cf"
+                "a14556b2.428608"
             ]
         ]
     },
     {
-        "id": "a1c491a.b9e1cf",
+        "id": "a14556b2.428608",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 748.75,
-        "y": 1816,
-        "z": "111f91bb.269a56",
+        "x": 745.566650390625,
+        "y": 1689,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "c7d001fc.995ef"
+                "e5395881.3f95e"
             ]
         ]
     },
     {
-        "id": "c7d001fc.995ef",
+        "id": "e5395881.3f95e",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 960.75,
-        "y": 1817,
-        "z": "111f91bb.269a56",
+        "x": 957.566650390625,
+        "y": 1690,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "af8caf57.c80ff"
+                "ee871fda.29052"
             ]
         ]
     },
     {
-        "id": "af8caf57.c80ff",
+        "id": "ee871fda.29052",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 216.75,
-        "y": 1973,
-        "z": "111f91bb.269a56",
+        "x": 213.566650390625,
+        "y": 1846,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "dbb11610.758b08",
-                "e6442fee.44c628"
+                "d07450f8.7cfbd8",
+                "c80ac602.107b6"
             ]
         ]
     },
     {
-        "id": "e6442fee.44c628",
+        "id": "c80ac602.107b6",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 451.75,
-        "y": 1960,
-        "z": "111f91bb.269a56",
+        "x": 448.566650390625,
+        "y": 1833,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "dbb11610.758b08",
+        "id": "d07450f8.7cfbd8",
         "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": 441.75,
-        "y": 2021,
-        "z": "111f91bb.269a56",
+        "x": 438.566650390625,
+        "y": 1894,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "afa88564.16a37",
-                "83950a7.2f6c078",
-                "12b1aba5.e7a0f4"
+                "3c9f89f1.b2d72e",
+                "7eb3712.5c8929",
+                "ab93aafa.12aed"
             ]
         ]
     },
     {
-        "id": "83950a7.2f6c078",
+        "id": "7eb3712.5c8929",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 655.240966796875,
-        "y": 2005.5740356445312,
-        "z": "111f91bb.269a56",
+        "x": 652.0576171875,
+        "y": 1878.5740356445312,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ea85ca6d.e8d7e"
+                "abd0cdd.d934eb"
             ]
         ]
     },
     {
-        "id": "12b1aba5.e7a0f4",
+        "id": "ab93aafa.12aed",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 650.75,
-        "y": 2050,
-        "z": "111f91bb.269a56",
+        "x": 647.566650390625,
+        "y": 1923,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "eb678b0e.5293e8"
+                "b79502c7.acaad8"
             ]
         ]
     },
     {
-        "id": "afa88564.16a37",
+        "id": "3c9f89f1.b2d72e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 652.75,
-        "y": 2110,
-        "z": "111f91bb.269a56",
+        "x": 649.566650390625,
+        "y": 1983,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "46f07676.1e063"
+                "509a448f.bd538c"
             ]
         ]
     },
     {
-        "id": "ea85ca6d.e8d7e",
+        "id": "abd0cdd.d934eb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 817.8125,
-        "y": 2004.8597412109375,
-        "z": "111f91bb.269a56",
+        "x": 814.629150390625,
+        "y": 1877.8597412109375,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "eb678b0e.5293e8",
+        "id": "b79502c7.acaad8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 818.75,
-        "y": 2050,
-        "z": "111f91bb.269a56",
+        "x": 815.566650390625,
+        "y": 1923,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "46f07676.1e063",
+        "id": "509a448f.bd538c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 821.75,
-        "y": 2109,
-        "z": "111f91bb.269a56",
+        "x": 818.566650390625,
+        "y": 1982,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "d6f04402.414508",
-                "ac4ce335.0555f"
+                "fd6f29b3.e5c99",
+                "f26de900.3c25f8"
             ]
         ]
     },
     {
-        "id": "42a4fda9.57619c",
+        "id": "3501776f.2dad38",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
         "comments": "",
-        "x": 241.75,
-        "y": 2611,
-        "z": "111f91bb.269a56",
+        "x": 238.566650390625,
+        "y": 2484,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "3738a9bc.2f26e6",
+        "id": "ae9e098e.f50fb",
         "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": 363.75,
-        "y": 2668,
-        "z": "111f91bb.269a56",
+        "x": 360.566650390625,
+        "y": 2541,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ac81680a.65fae",
-                "96fc6628.148e78"
+                "be334cda.e25598",
+                "43d4ffc9.f69dc"
             ]
         ]
     },
     {
-        "id": "ac81680a.65fae",
+        "id": "be334cda.e25598",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 676.25,
-        "y": 2645,
-        "z": "111f91bb.269a56",
+        "x": 673.066650390625,
+        "y": 2518,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "96fc6628.148e78",
+        "id": "43d4ffc9.f69dc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 680.25,
-        "y": 2685,
-        "z": "111f91bb.269a56",
+        "x": 677.066650390625,
+        "y": 2558,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "bf7ee9c0.419518"
+                "f38c34e4.0af87"
             ]
         ]
     },
     {
-        "id": "6f03e95e.3ec198",
+        "id": "1415cbe4.3643cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 856.25,
-        "y": 2649,
-        "z": "111f91bb.269a56",
+        "x": 853.066650390625,
+        "y": 2522,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "bf7ee9c0.419518",
+        "id": "f38c34e4.0af87",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 871.75,
-        "y": 2703,
-        "z": "111f91bb.269a56",
+        "x": 868.566650390625,
+        "y": 2576,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "846842ab.33ca8",
-                "5e1c0ed5.c69c48",
-                "9a742833.7a10a8",
-                "feb8a80.2e93d58"
+                "38f98e31.2df7c2",
+                "2709d484.f39df4",
+                "708149ff.3b7b8",
+                "40e18201.7f31fc"
             ]
         ]
     },
     {
-        "id": "214d3a40.5474be",
+        "id": "4fb2f1f7.44fff8",
         "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": 1167.25,
-        "y": 2672,
-        "z": "111f91bb.269a56",
+        "x": 1164.066650390625,
+        "y": 2545,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "4243a8af.47f99",
+        "id": "8d799ed5.7c896",
         "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": 2634.25,
-        "y": 2023,
-        "z": "111f91bb.269a56",
+        "x": 2631.066650390625,
+        "y": 1896,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "846842ab.33ca8",
+        "id": "38f98e31.2df7c2",
         "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": 1129.25,
-        "y": 2714,
-        "z": "111f91bb.269a56",
+        "x": 1126.066650390625,
+        "y": 2587,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "eb2c1071.d160d8",
+        "id": "421d14d0.8fa8dc",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 1994.25,
-        "y": 1303,
-        "z": "111f91bb.269a56",
+        "x": 1991.066650390625,
+        "y": 1176,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "3c1d8397.66cfbc",
+        "id": "f196d566.5b274",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 1995.25,
-        "y": 1407,
-        "z": "111f91bb.269a56",
+        "x": 1992.066650390625,
+        "y": 1280,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "9dbb6108.db3f08",
+        "id": "8954306d.3c458",
         "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": 4288.75,
-        "y": 664,
-        "z": "111f91bb.269a56",
+        "x": 4285.566650390625,
+        "y": 537,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "971d8a82.30a53",
+        "id": "173252a4.3c7835",
         "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": 4191.75,
-        "y": 1483,
-        "z": "111f91bb.269a56",
+        "x": 4188.566650390625,
+        "y": 1356,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "72e7ea14.321c0c",
+        "id": "745353ea.a7c82c",
         "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": 3685.75,
-        "y": 2155,
-        "z": "111f91bb.269a56",
+        "x": 3682.566650390625,
+        "y": 2028,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "9b9627ac.373dc8",
+        "id": "33f1fe4a.c9d6f2",
         "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": 786.75,
-        "y": 963,
-        "z": "111f91bb.269a56",
+        "x": 783.566650390625,
+        "y": 836,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "20416bfa.abd944",
-                "3157f22c.bca4c6"
+                "c7ca69b2.c33e8",
+                "dbefa186.4d7f68"
             ]
         ]
     },
     {
-        "id": "20416bfa.abd944",
+        "id": "c7ca69b2.c33e8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1149.75,
-        "y": 986,
-        "z": "111f91bb.269a56",
+        "x": 1146.566650390625,
+        "y": 859,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "16371b2a.82f3f5"
+                "100503a.a2b7efc"
             ]
         ]
     },
     {
-        "id": "3157f22c.bca4c6",
+        "id": "dbefa186.4d7f68",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1149.75,
-        "y": 935,
-        "z": "111f91bb.269a56",
+        "x": 1146.566650390625,
+        "y": 808,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "7c942827.229d68"
+                "5ea3a0fe.77a12"
             ]
         ]
     },
     {
-        "id": "16371b2a.82f3f5",
+        "id": "100503a.a2b7efc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1305.75,
-        "y": 984,
-        "z": "111f91bb.269a56",
+        "x": 1302.566650390625,
+        "y": 857,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "6516a515.9e0ed4"
+                "8fcbaf21.052888"
             ]
         ]
     },
     {
-        "id": "7c942827.229d68",
+        "id": "5ea3a0fe.77a12",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1282.75,
-        "y": 936,
-        "z": "111f91bb.269a56",
+        "x": 1279.566650390625,
+        "y": 809,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1721022.90ae5",
+        "id": "84203861.d12558",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2042.75,
-        "y": 334,
-        "z": "111f91bb.269a56",
+        "x": 2039.566650390625,
+        "y": 207,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "a1c10f72.410b08",
+        "id": "a43e9ba4.30fe8",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3584.75,
-        "y": 2315,
-        "z": "111f91bb.269a56",
+        "x": 3581.566650390625,
+        "y": 2188,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "7f10b67d.13cbf",
+        "id": "d41278c1.0e8268",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4174.75,
-        "y": 788,
-        "z": "111f91bb.269a56",
+        "x": 4171.566650390625,
+        "y": 661,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "277d0a08.b51776",
+        "id": "559bb9d.67d2e48",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1348.75,
-        "y": 1894,
-        "z": "111f91bb.269a56",
+        "x": 1345.566650390625,
+        "y": 1767,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "dbed9630.5fe208",
+        "id": "11998164.d0953f",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 527.75,
-        "y": 1628,
-        "z": "111f91bb.269a56",
+        "x": 524.566650390625,
+        "y": 1501,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "b8630526.556578",
+        "id": "3fbbcb97.f97994",
         "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": 558.75,
-        "y": 1668,
-        "z": "111f91bb.269a56",
+        "x": 555.566650390625,
+        "y": 1541,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "d6f04402.414508",
+        "id": "fd6f29b3.e5c99",
         "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": 1106.75,
-        "y": 2076,
-        "z": "111f91bb.269a56",
+        "x": 1103.566650390625,
+        "y": 1949,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "ac4ce335.0555f",
+        "id": "f26de900.3c25f8",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1109.75,
-        "y": 2118,
-        "z": "111f91bb.269a56",
+        "x": 1106.566650390625,
+        "y": 1991,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "d6151d45.cfb988",
+        "id": "10dd7514.d835b3",
         "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": 552.75,
-        "y": 1758,
-        "z": "111f91bb.269a56",
+        "x": 549.566650390625,
+        "y": 1631,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "f1b784f.6be4af8",
+        "id": "9cbc66e4.acef28",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 307.75,
-        "y": 2137,
-        "z": "111f91bb.269a56",
+        "x": 304.566650390625,
+        "y": 2010,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "b54d5a69.762db",
+        "id": "2ee73d5.0d9a4c2",
         "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": 315.75,
-        "y": 2194,
-        "z": "111f91bb.269a56",
+        "x": 312.566650390625,
+        "y": 2067,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d833ac3.a3e554",
+        "id": "d55a6f33.2c1388",
         "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": 1326.75,
-        "y": 1743,
-        "z": "111f91bb.269a56",
+        "x": 1323.566650390625,
+        "y": 1616,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "5ddf355f.54101c",
-                "1bdf6619.a36342"
+                "9cf30931.2c59c8",
+                "da4af294.46477"
             ]
         ]
     },
     {
-        "id": "1bdf6619.a36342",
+        "id": "da4af294.46477",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1549.75,
-        "y": 1698,
-        "z": "111f91bb.269a56",
+        "x": 1546.566650390625,
+        "y": 1571,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "754506fa.d51aa8"
+                "66fe36a9.5f3c98"
             ]
         ]
     },
     {
-        "id": "5ddf355f.54101c",
+        "id": "9cf30931.2c59c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1551.75,
-        "y": 1762,
-        "z": "111f91bb.269a56",
+        "x": 1548.566650390625,
+        "y": 1635,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "68209615.eef37"
+                "204d74d2.252cac"
             ]
         ]
     },
     {
-        "id": "754506fa.d51aa8",
+        "id": "66fe36a9.5f3c98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1714.75,
-        "y": 1695,
-        "z": "111f91bb.269a56",
+        "x": 1711.566650390625,
+        "y": 1568,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "714f4595.b88ec4"
+                "4c93c317.b90e14"
             ]
         ]
     },
     {
-        "id": "68209615.eef37",
+        "id": "204d74d2.252cac",
         "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": 1713.75,
-        "y": 1758,
-        "z": "111f91bb.269a56",
+        "x": 1710.566650390625,
+        "y": 1631,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "714f4595.b88ec4",
+        "id": "4c93c317.b90e14",
         "type": "set",
         "name": "set tmp.uni-node-id-short",
         "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",
         "comments": "",
-        "x": 1934.75,
-        "y": 1709,
-        "z": "111f91bb.269a56",
+        "x": 1931.566650390625,
+        "y": 1582,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "1db1829e.06c1d5",
+        "id": "83593740.e4ddd",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1479.75,
-        "y": 2434,
-        "z": "111f91bb.269a56",
+        "x": 1476.566650390625,
+        "y": 2307,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "2cbd7342.8e2ecc"
+                "bc0ef8cb.38db18"
             ]
         ]
     },
     {
-        "id": "fa138a5b.3e0008",
+        "id": "a1ab9a32.41426",
         "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": 1864.75,
-        "y": 2447,
-        "z": "111f91bb.269a56",
+        "x": 1861.566650390625,
+        "y": 2320,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "e14f1acf.1bcd",
-                "c2e19be7.fca29",
-                "775dbfec.d9501"
+                "eafaddf4.4288",
+                "a1c53fdc.e94408",
+                "b9669b07.a51828"
             ]
         ]
     },
     {
-        "id": "2cbd7342.8e2ecc",
+        "id": "bc0ef8cb.38db18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1658.75,
-        "y": 2434,
-        "z": "111f91bb.269a56",
+        "x": 1655.566650390625,
+        "y": 2307,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "6f327062.742838",
-                "fa138a5b.3e0008"
+                "2580690.f3eb118",
+                "a1ab9a32.41426"
             ]
         ]
     },
     {
-        "id": "6f327062.742838",
+        "id": "2580690.f3eb118",
         "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": 1894.75,
-        "y": 2395,
-        "z": "111f91bb.269a56",
+        "x": 1891.566650390625,
+        "y": 2268,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "e14f1acf.1bcd",
+        "id": "eafaddf4.4288",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2074.75,
-        "y": 2438,
-        "z": "111f91bb.269a56",
+        "x": 2071.566650390625,
+        "y": 2311,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "d0fc139e.1761"
+                "13cd3d1.ffcccc3"
             ]
         ]
     },
     {
-        "id": "c2e19be7.fca29",
+        "id": "a1c53fdc.e94408",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2066.75,
-        "y": 2493,
-        "z": "111f91bb.269a56",
+        "x": 2063.566650390625,
+        "y": 2366,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "43b937df.ececd8"
+                "7da7ccee.d6972c"
             ]
         ]
     },
     {
-        "id": "775dbfec.d9501",
+        "id": "b9669b07.a51828",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2071.75,
-        "y": 2550,
-        "z": "111f91bb.269a56",
+        "x": 2068.566650390625,
+        "y": 2423,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ac944679.99243"
+                "2930329b.329efe"
             ]
         ]
     },
     {
-        "id": "ac944679.99243",
+        "id": "2930329b.329efe",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2223.75,
-        "y": 2551,
-        "z": "111f91bb.269a56",
+        "x": 2220.566650390625,
+        "y": 2424,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "43b937df.ececd8",
+        "id": "7da7ccee.d6972c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2234.75,
-        "y": 2496,
-        "z": "111f91bb.269a56",
+        "x": 2231.566650390625,
+        "y": 2369,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "d0fc139e.1761",
+        "id": "13cd3d1.ffcccc3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2219.13232421875,
-        "y": 2435.6556701660156,
-        "z": "111f91bb.269a56",
+        "x": 2215.948974609375,
+        "y": 2308.6556701660156,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "79bc2aa4.303284"
+                "febf727.ffe5c9"
             ]
         ]
     },
     {
-        "id": "79bc2aa4.303284",
+        "id": "febf727.ffe5c9",
         "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": 2433.75,
-        "y": 2432,
-        "z": "111f91bb.269a56",
+        "x": 2430.566650390625,
+        "y": 2305,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "d91a9773.8b97d8",
+        "id": "2716544d.2e4214",
         "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": 557.75,
-        "y": 2480,
-        "z": "111f91bb.269a56",
+        "x": 554.566650390625,
+        "y": 2353,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "fd5d97.57110a68",
-                "e3891e3f.2fa52",
-                "6282c457.966ab4"
+                "a2a1891d.4d5168",
+                "9cd28e00.2567d",
+                "a8c6a166.3984e"
             ]
         ]
     },
     {
-        "id": "fd5d97.57110a68",
+        "id": "a2a1891d.4d5168",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 753.2501220703125,
-        "y": 2432,
-        "z": "111f91bb.269a56",
+        "x": 750.0667724609375,
+        "y": 2305,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ee247bd7.5fac58"
+                "6cfc839f.58b674"
             ]
         ]
     },
     {
-        "id": "e3891e3f.2fa52",
+        "id": "9cd28e00.2567d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 745.2501220703125,
-        "y": 2487,
-        "z": "111f91bb.269a56",
+        "x": 742.0667724609375,
+        "y": 2360,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "91fa570e.651ca8"
+                "7eb3886b.0a9b58"
             ]
         ]
     },
     {
-        "id": "ee247bd7.5fac58",
+        "id": "6cfc839f.58b674",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 897.6324462890625,
-        "y": 2431.6556701660156,
-        "z": "111f91bb.269a56",
+        "x": 894.4490966796875,
+        "y": 2304.6556701660156,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "ea7d04e7.1afcb8"
+                "cd8dae32.8ecf2"
             ]
         ]
     },
     {
-        "id": "ea7d04e7.1afcb8",
+        "id": "cd8dae32.8ecf2",
         "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": 1081.75,
-        "y": 2430,
-        "z": "111f91bb.269a56",
+        "x": 1078.566650390625,
+        "y": 2303,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "40c13bcd.4d6ac4"
+                "2f1b8cbe.c629a4"
             ]
         ]
     },
     {
-        "id": "40c13bcd.4d6ac4",
+        "id": "2f1b8cbe.c629a4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1276.75,
-        "y": 2430,
-        "z": "111f91bb.269a56",
+        "x": 1273.566650390625,
+        "y": 2303,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "1db1829e.06c1d5"
+                "83593740.e4ddd"
             ]
         ]
     },
     {
-        "id": "6282c457.966ab4",
+        "id": "a8c6a166.3984e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 750.2501220703125,
-        "y": 2544,
-        "z": "111f91bb.269a56",
+        "x": 747.0667724609375,
+        "y": 2417,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "4979dd8d.1f5f3c"
+                "1a3f5fd3.7d7ca8"
             ]
         ]
     },
     {
-        "id": "4979dd8d.1f5f3c",
+        "id": "1a3f5fd3.7d7ca8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 902.2501220703125,
-        "y": 2545,
-        "z": "111f91bb.269a56",
+        "x": 899.0667724609375,
+        "y": 2418,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "91fa570e.651ca8",
+        "id": "7eb3886b.0a9b58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 913.2501220703125,
-        "y": 2488,
-        "z": "111f91bb.269a56",
+        "x": 910.0667724609375,
+        "y": 2361,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "bd1da98.2130f58",
+        "id": "7c9a9ea1.e0f0b",
         "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": 547.75,
-        "y": 2392,
-        "z": "111f91bb.269a56",
+        "x": 544.566650390625,
+        "y": 2265,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "aa3bbb2.a6f0e48",
+        "id": "c2f9529c.5f262",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 292.75,
-        "y": 2523,
-        "z": "111f91bb.269a56",
+        "x": 289.566650390625,
+        "y": 2396,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "bd1da98.2130f58",
-                "d91a9773.8b97d8"
+                "7c9a9ea1.e0f0b",
+                "2716544d.2e4214"
             ]
         ]
     },
     {
-        "id": "4b46d34a.40e874",
+        "id": "57a26dc0.1ee23c",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1507.7166748046875,
-        "y": 340.8833312988281,
-        "z": "111f91bb.269a56",
+        "x": 1504.5333251953125,
+        "y": 213.88333129882812,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "1d9a3789.c423c",
+        "id": "7627d017.e729d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 709.75,
-        "y": 563,
-        "z": "111f91bb.269a56",
+        "x": 706.566650390625,
+        "y": 436,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "6516a515.9e0ed4",
+        "id": "40266792.930ff8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 269.25,
-        "y": 1532,
-        "z": "111f91bb.269a56",
+        "x": 266.066650390625,
+        "y": 1405,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "f6f3f7dd.ddd42",
-                "9ae45b75.53fe1",
-                "dbed9630.5fe208",
-                "b8630526.556578",
-                "42a4fda9.57619c",
-                "3738a9bc.2f26e6",
-                "d6151d45.cfb988",
-                "f1b784f.6be4af8",
-                "b54d5a69.762db",
-                "aa3bbb2.a6f0e48"
+                "d82baf7f.56b2f",
+                "513cbd5b.994ffc",
+                "11998164.d0953f",
+                "3fbbcb97.f97994",
+                "3501776f.2dad38",
+                "ae9e098e.f50fb",
+                "10dd7514.d835b3",
+                "9cbc66e4.acef28",
+                "2ee73d5.0d9a4c2",
+                "c2f9529c.5f262",
+                "cf851282.1a25c8"
             ]
         ]
     },
     {
-        "id": "6bd95e1e.6c91d8",
+        "id": "bc764283.2e9fd8",
         "type": "switchNode",
         "name": "switch uni type",
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1299.75,
-        "y": 1370,
-        "z": "111f91bb.269a56",
+        "x": 1296.566650390625,
+        "y": 1243,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "92533584.a5f61",
-                "18980475.16f3b4",
-                "ec63f877.0fd998",
-                "c1c9dc9a.d31ec"
+                "4133a5fe.bd0afc",
+                "cb7bb63e.a271e8",
+                "9b203a87.8531b",
+                "86f7d9c6.6cceb8"
             ]
         ]
     },
     {
-        "id": "92533584.a5f61",
+        "id": "4133a5fe.bd0afc",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1464.75,
-        "y": 1352,
-        "z": "111f91bb.269a56",
+        "x": 1461.566650390625,
+        "y": 1225,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "b00f22e0.6a5e"
+                "34effc93.508fc4"
             ]
         ]
     },
     {
-        "id": "18980475.16f3b4",
+        "id": "cb7bb63e.a271e8",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1467.75,
-        "y": 1391,
-        "z": "111f91bb.269a56",
+        "x": 1464.566650390625,
+        "y": 1264,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "52cb104.aabcaf"
+                "ceed6ba9.27c0d"
             ]
         ]
     },
     {
-        "id": "c1c9dc9a.d31ec",
+        "id": "86f7d9c6.6cceb8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1461.75,
-        "y": 1469,
-        "z": "111f91bb.269a56",
+        "x": 1458.566650390625,
+        "y": 1342,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "4eaa272a.ec5048"
+                "971b0d55.da5e"
             ]
         ]
     },
     {
-        "id": "ec63f877.0fd998",
+        "id": "9b203a87.8531b",
         "type": "outcome",
         "name": "root-secondary",
         "xml": "<outcome value='root-secondary'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1484.75,
-        "y": 1432,
-        "z": "111f91bb.269a56",
+        "x": 1481.566650390625,
+        "y": 1305,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "e77dda82.efac78"
+                "f1880c82.5bc33"
             ]
         ]
     },
     {
-        "id": "fb2c8aff.5902e",
+        "id": "f85814f1.078ec8",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2030.75,
-        "y": 1465,
-        "z": "111f91bb.269a56",
+        "x": 2027.566650390625,
+        "y": 1338,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "c8ca91d0.91a568",
+        "id": "17372550.7b802b",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
         "comments": "",
-        "x": 1992.75,
-        "y": 1505,
-        "z": "111f91bb.269a56",
+        "x": 1989.566650390625,
+        "y": 1378,
+        "z": "8603b63b.c1c358",
         "wires": []
     },
     {
-        "id": "4eaa272a.ec5048",
+        "id": "971b0d55.da5e",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1613.75,
-        "y": 1490,
-        "z": "111f91bb.269a56",
+        "x": 1610.566650390625,
+        "y": 1363,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e1c0ed5.c69c48",
+        "id": "2709d484.f39df4",
         "type": "execute",
         "name": "execute RestApiCallNode Create Performance Monitoring Data",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1203.3333740234375,
-        "y": 2789.3336181640625,
-        "z": "111f91bb.269a56",
+        "x": 1200.1500244140625,
+        "y": 2662.3336181640625,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "b00f22e0.6a5e",
+        "id": "34effc93.508fc4",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1599.6666259765625,
-        "y": 1348.333251953125,
-        "z": "111f91bb.269a56",
+        "x": 1596.4832763671875,
+        "y": 1221.333251953125,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "eb2c1071.d160d8"
+                "421d14d0.8fa8dc"
             ]
         ]
     },
     {
-        "id": "52cb104.aabcaf",
+        "id": "ceed6ba9.27c0d",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1601.6666259765625,
-        "y": 1386.333251953125,
-        "z": "111f91bb.269a56",
+        "x": 1598.4832763671875,
+        "y": 1259.333251953125,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "3c1d8397.66cfbc"
+                "f196d566.5b274"
             ]
         ]
     },
     {
-        "id": "e77dda82.efac78",
+        "id": "f1880c82.5bc33",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1644.6666259765625,
-        "y": 1433.333251953125,
-        "z": "111f91bb.269a56",
+        "x": 1641.4832763671875,
+        "y": 1306.333251953125,
+        "z": "8603b63b.c1c358",
         "wires": [
             [
-                "c8ca91d0.91a568"
+                "17372550.7b802b"
             ]
         ]
     },
     {
-        "id": "9a742833.7a10a8",
+        "id": "708149ff.3b7b8",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishSubscription",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1171.3333740234375,
-        "y": 2861.33349609375,
-        "z": "111f91bb.269a56",
+        "x": 1168.1500244140625,
+        "y": 2734.33349609375,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
     },
     {
-        "id": "feb8a80.2e93d58",
+        "id": "40e18201.7f31fc",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishPersistentConnection",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1201.3333740234375,
-        "y": 2923.33349609375,
-        "z": "111f91bb.269a56",
+        "x": 1198.1500244140625,
+        "y": 2796.33349609375,
+        "z": "8603b63b.c1c358",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "cf851282.1a25c8",
+        "type": "set",
+        "name": "unset ethernet-srv-end-points-list",
+        "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
+        "comments": "",
+        "x": 591.566650390625,
+        "y": 1343.166748046875,
+        "z": "8603b63b.c1c358",
+        "wires": []
+    },
+    {
+        "id": "8fcbaf21.052888",
+        "type": "switchNode",
+        "name": "switch conn type",
+        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 132.56666564941406,
+        "y": 1054.1666259765625,
+        "z": "8603b63b.c1c358",
+        "wires": [
+            [
+                "5e5b0dce.955fb4",
+                "7fcb1378.0439ec"
+            ]
+        ]
+    },
+    {
+        "id": "7fcb1378.0439ec",
+        "type": "outcome",
+        "name": "root",
+        "xml": "<outcome value='root'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 317.566650390625,
+        "y": 1228.1666259765625,
+        "z": "8603b63b.c1c358",
+        "wires": [
+            [
+                "40266792.930ff8"
+            ]
+        ]
+    },
+    {
+        "id": "5e5b0dce.955fb4",
+        "type": "outcome",
+        "name": "leaf",
+        "xml": "<outcome value='leaf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 320.566650390625,
+        "y": 1183.1666259765625,
+        "z": "8603b63b.c1c358",
+        "wires": [
+            [
+                "40266792.930ff8"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
index 459577cb..cd4962c2 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "2b7da8b.17ed9d8",
+        "id": "94ab5931.1ae6d",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 248,
-        "y": 45,
-        "z": "ab59e982.86c81",
+        "x": 292.566650390625,
+        "y": 59.56666564941406,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "970691bb.ddc15"
+                "1c26c9e8.6ceaee"
             ]
         ]
     },
     {
-        "id": "970691bb.ddc15",
+        "id": "1c26c9e8.6ceaee",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,3073 +22,3073 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 532.2856903076172,
-        "y": 106.23810863494873,
-        "z": "ab59e982.86c81",
+        "x": 576.8523406982422,
+        "y": 120.8047742843628,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "60aef583.9235ac"
+                "23f5599a.c9cd86"
             ]
         ]
     },
     {
-        "id": "60aef583.9235ac",
+        "id": "23f5599a.c9cd86",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 448.4285888671875,
-        "y": 184.00003051757812,
-        "z": "ab59e982.86c81",
+        "x": 492.9952392578125,
+        "y": 198.5666961669922,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "aea204d6.6a791"
+                "dc959d18.681ba8"
             ]
         ]
     },
     {
-        "id": "aea204d6.6a791",
+        "id": "dc959d18.681ba8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 182.238037109375,
-        "y": 687.6666870117188,
-        "z": "ab59e982.86c81",
+        "x": 226.8046875,
+        "y": 702.2333526611328,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "8d663f65.8f74e8",
-                "8c3bad0a.2ae1e",
-                "7334fea3.c843f",
-                "322c901e.38e458",
-                "363053e.3c7802c",
-                "6a3e2f90.eef6e",
-                "65e8fb60.0959f4",
-                "af2be5de.84caa8"
+                "3133ba0.df70946",
+                "a232054c.f7cde",
+                "cf7049ac.59d6b8",
+                "da9884fe.c1ab2",
+                "d00a834c.9393c8",
+                "e4a1c30c.a1f11",
+                "ed8a3e8e.eba718",
+                "5d4c8b88.6ea084"
             ]
         ]
     },
     {
-        "id": "8d663f65.8f74e8",
+        "id": "3133ba0.df70946",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 455,
-        "y": 642,
-        "z": "ab59e982.86c81",
+        "x": 499.566650390625,
+        "y": 656.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "8c3bad0a.2ae1e",
+        "id": "a232054c.f7cde",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 676,
-        "y": 710,
-        "z": "ab59e982.86c81",
+        "x": 720.566650390625,
+        "y": 724.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "7334fea3.c843f",
+        "id": "cf7049ac.59d6b8",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 466,
-        "y": 756,
-        "z": "ab59e982.86c81",
+        "x": 510.566650390625,
+        "y": 770.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a3e2f90.eef6e",
+        "id": "e4a1c30c.a1f11",
         "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": 659,
-        "y": 820,
-        "z": "ab59e982.86c81",
+        "x": 703.566650390625,
+        "y": 834.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "65e8fb60.0959f4",
+        "id": "ed8a3e8e.eba718",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 751,
-        "y": 1199,
-        "z": "ab59e982.86c81",
+        "x": 795.566650390625,
+        "y": 1213.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "c2ebc420.8ee88"
+                "a0634476.d7e6f8"
             ]
         ]
     },
     {
-        "id": "c2ebc420.8ee88",
+        "id": "a0634476.d7e6f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 972.9999694824219,
-        "y": 1211,
-        "z": "ab59e982.86c81",
+        "x": 1017.5666198730469,
+        "y": 1225.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "2cc97555.3fad02",
-                "78caef7b.ab95f8",
-                "9c05f571.1eb168",
-                "eda8e4ad.92ee8",
-                "a27c8181.cf517",
-                "e500131.d3db37",
-                "b4245913.ae7bb",
-                "ac5e1496.5bc93",
-                "6299b58a.3a41b4",
-                "6cd61101.45105"
+                "aaab02fa.9f4d88",
+                "c83caaf9.d6f6",
+                "a09d3d16.a9628",
+                "38b6179d.185d98",
+                "6e9dd85.efe07a8",
+                "ef30d7fa.1abd9",
+                "ba078fb1.cbb95",
+                "95800647.4aa41",
+                "84e1fc7d.aa5158",
+                "4be74bfa.e8a9a4"
             ]
         ]
     },
     {
-        "id": "2cc97555.3fad02",
+        "id": "aaab02fa.9f4d88",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648,
-        "y": 790,
-        "z": "ab59e982.86c81",
+        "x": 1692.566650390625,
+        "y": 804.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "78caef7b.ab95f8",
+        "id": "c83caaf9.d6f6",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1362,
-        "y": 880,
-        "z": "ab59e982.86c81",
+        "x": 1406.566650390625,
+        "y": 894.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "b4cf3f6b.7b5288",
-                "f7c5eac6.57b338"
+                "a21a8c5c.c26b18",
+                "5ad886dd.89cfc"
             ]
         ]
     },
     {
-        "id": "b4cf3f6b.7b5288",
+        "id": "a21a8c5c.c26b18",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1728,
-        "y": 841,
-        "z": "ab59e982.86c81",
+        "x": 1772.566650390625,
+        "y": 855.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "7ef1427a.0fd4ac"
+                "492daa68.bf54bc"
             ]
         ]
     },
     {
-        "id": "f7c5eac6.57b338",
+        "id": "5ad886dd.89cfc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1729,
-        "y": 887,
-        "z": "ab59e982.86c81",
+        "x": 1773.566650390625,
+        "y": 901.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "26ca350f.1d9a8a"
+                "5f6a6611.d2602"
             ]
         ]
     },
     {
-        "id": "7ef1427a.0fd4ac",
+        "id": "492daa68.bf54bc",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 1942,
-        "y": 840,
-        "z": "ab59e982.86c81",
+        "x": 1986.566650390625,
+        "y": 854.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "26ca350f.1d9a8a",
+        "id": "5f6a6611.d2602",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 1940,
-        "y": 885,
-        "z": "ab59e982.86c81",
+        "x": 1984.566650390625,
+        "y": 899.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "9c05f571.1eb168",
+        "id": "a09d3d16.a9628",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 1538,
-        "y": 954,
-        "z": "ab59e982.86c81",
+        "x": 1582.566650390625,
+        "y": 968.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "eda8e4ad.92ee8",
+        "id": "38b6179d.185d98",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1582,
-        "y": 1002,
-        "z": "ab59e982.86c81",
+        "x": 1626.566650390625,
+        "y": 1016.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "79ecfb4e.255ea4",
-                "441f51df.f58208",
-                "204f27c3.a07c18"
+                "1e4fefc4.84dea",
+                "140ba84b.114188",
+                "5ac6d6d0.fa8f3"
             ]
         ]
     },
     {
-        "id": "79ecfb4e.255ea4",
+        "id": "1e4fefc4.84dea",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1794.5,
-        "y": 949,
-        "z": "ab59e982.86c81",
+        "x": 1839.066650390625,
+        "y": 963.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "eac32b1e.ec64f"
+                "c513ad5c.67a2a8"
             ]
         ]
     },
     {
-        "id": "441f51df.f58208",
+        "id": "140ba84b.114188",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1806.5,
-        "y": 999,
-        "z": "ab59e982.86c81",
+        "x": 1851.066650390625,
+        "y": 1013.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "4a1b3b6f.aa547c"
+                "56e61af8.fb0edc"
             ]
         ]
     },
     {
-        "id": "204f27c3.a07c18",
+        "id": "5ac6d6d0.fa8f3",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1797.5,
-        "y": 1054,
-        "z": "ab59e982.86c81",
+        "x": 1842.066650390625,
+        "y": 1068.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "afa61155.e3e4f"
+                "5b77e98c.bb3518"
             ]
         ]
     },
     {
-        "id": "afa61155.e3e4f",
+        "id": "5b77e98c.bb3518",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1942.5,
-        "y": 1053,
-        "z": "ab59e982.86c81",
+        "x": 1987.066650390625,
+        "y": 1067.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "4a1b3b6f.aa547c",
+        "id": "56e61af8.fb0edc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1953.5,
-        "y": 996,
-        "z": "ab59e982.86c81",
+        "x": 1998.066650390625,
+        "y": 1010.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "eac32b1e.ec64f",
+        "id": "c513ad5c.67a2a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1919.8824462890625,
-        "y": 942.6556701660156,
-        "z": "ab59e982.86c81",
+        "x": 1964.4490966796875,
+        "y": 957.2223358154297,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "3c0a3138.bdd26e"
+                "e866a3e1.053498"
             ]
         ]
     },
     {
-        "id": "3c0a3138.bdd26e",
+        "id": "e866a3e1.053498",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2081,
-        "y": 957,
-        "z": "ab59e982.86c81",
+        "x": 2125.566650390625,
+        "y": 971.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "e187685d.0e36b8"
+                "5690d718.48c698"
             ]
         ]
     },
     {
-        "id": "e187685d.0e36b8",
+        "id": "5690d718.48c698",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2276,
-        "y": 957,
-        "z": "ab59e982.86c81",
+        "x": 2320.566650390625,
+        "y": 971.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "124aeba.98fab14"
+                "f99896f3.a9973"
             ]
         ]
     },
     {
-        "id": "48b536ea.5f9248",
+        "id": "804d49e5.886028",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2656,
-        "y": 953,
-        "z": "ab59e982.86c81",
+        "x": 2700.566650390625,
+        "y": 967.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "c8495fb1.c63f38",
-                "9a0b489a.f82b3"
+                "ebd7bd5b.40a158",
+                "9cbfb486.1d485"
             ]
         ]
     },
     {
-        "id": "9a0b489a.f82b3",
+        "id": "9cbfb486.1d485",
         "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": 2864,
-        "y": 960,
-        "z": "ab59e982.86c81",
+        "x": 2908.566650390625,
+        "y": 974.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "ff325fba.81a3f",
-                "5e11cb23.ea8384",
-                "435ef02b.e0a51"
+                "eb53f24.9c8df9",
+                "b699925f.52e788",
+                "177a0a75.4ffe3e"
             ]
         ]
     },
     {
-        "id": "c8495fb1.c63f38",
+        "id": "ebd7bd5b.40a158",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2894,
-        "y": 908,
-        "z": "ab59e982.86c81",
+        "x": 2938.566650390625,
+        "y": 922.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "ff325fba.81a3f",
+        "id": "eb53f24.9c8df9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3074,
-        "y": 951,
-        "z": "ab59e982.86c81",
+        "x": 3118.566650390625,
+        "y": 965.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "3437139a.bfdd9c"
+                "664ce225.e11764"
             ]
         ]
     },
     {
-        "id": "5e11cb23.ea8384",
+        "id": "b699925f.52e788",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3066,
-        "y": 1006,
-        "z": "ab59e982.86c81",
+        "x": 3110.566650390625,
+        "y": 1020.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "db1340d4.287d2"
+                "c5f2fad1.bd663"
             ]
         ]
     },
     {
-        "id": "435ef02b.e0a51",
+        "id": "177a0a75.4ffe3e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3071,
-        "y": 1063,
-        "z": "ab59e982.86c81",
+        "x": 3115.566650390625,
+        "y": 1077.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "c8c2b440.36c658"
+                "f4a026e6.715c"
             ]
         ]
     },
     {
-        "id": "c8c2b440.36c658",
+        "id": "f4a026e6.715c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3223,
-        "y": 1064,
-        "z": "ab59e982.86c81",
+        "x": 3267.566650390625,
+        "y": 1078.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "db1340d4.287d2",
+        "id": "c5f2fad1.bd663",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3234,
-        "y": 1009,
-        "z": "ab59e982.86c81",
+        "x": 3278.566650390625,
+        "y": 1023.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "3437139a.bfdd9c",
+        "id": "664ce225.e11764",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3218.38232421875,
-        "y": 948.6556701660156,
-        "z": "ab59e982.86c81",
+        "x": 3262.948974609375,
+        "y": 963.2223358154297,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "e7684b.19d5f7b8"
+                "a508abe9.f5813"
             ]
         ]
     },
     {
-        "id": "124aeba.98fab14",
+        "id": "f99896f3.a9973",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2479,
-        "y": 961,
-        "z": "ab59e982.86c81",
+        "x": 2523.566650390625,
+        "y": 975.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "48b536ea.5f9248"
+                "804d49e5.886028"
             ]
         ]
     },
     {
-        "id": "e7684b.19d5f7b8",
+        "id": "a508abe9.f5813",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3433,
-        "y": 945,
-        "z": "ab59e982.86c81",
+        "x": 3477.566650390625,
+        "y": 959.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "a27c8181.cf517",
+        "id": "6e9dd85.efe07a8",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1552,
-        "y": 1171,
-        "z": "ab59e982.86c81",
+        "x": 1596.566650390625,
+        "y": 1185.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "55f451b.c21bcb",
-                "148790b5.591b8f"
+                "75774fa2.7a2cf",
+                "4436153e.9cd34c"
             ]
         ]
     },
     {
-        "id": "55f451b.c21bcb",
+        "id": "75774fa2.7a2cf",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1753,
-        "y": 1169,
-        "z": "ab59e982.86c81",
+        "x": 1797.566650390625,
+        "y": 1183.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "190bbee0.fdc3a1"
+                "36577996.f92cc6"
             ]
         ]
     },
     {
-        "id": "a4ef5898.fcc6d8",
+        "id": "b48623b8.fdb8a",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2034,
-        "y": 1119,
-        "z": "ab59e982.86c81",
+        "x": 2078.566650390625,
+        "y": 1133.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "82a35f7.532ff2",
+        "id": "54c1b7cf.fc463",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1970,
-        "y": 1220,
-        "z": "ab59e982.86c81",
+        "x": 2014.566650390625,
+        "y": 1234.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "151d6bac.6b36ac",
-                "e7ce23ad.f63438"
+                "8183849e.8f8b9",
+                "edcb38ad.17a0a8"
             ]
         ]
     },
     {
-        "id": "151d6bac.6b36ac",
+        "id": "8183849e.8f8b9",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2200,
-        "y": 1216,
-        "z": "ab59e982.86c81",
+        "x": 2244.566650390625,
+        "y": 1230.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "1bd30175.73854f"
+                "eb1da6e2.d6cac"
             ]
         ]
     },
     {
-        "id": "148790b5.591b8f",
+        "id": "4436153e.9cd34c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1753,
-        "y": 1218,
-        "z": "ab59e982.86c81",
+        "x": 1797.566650390625,
+        "y": 1232.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "82a35f7.532ff2"
+                "54c1b7cf.fc463"
             ]
         ]
     },
     {
-        "id": "e7ce23ad.f63438",
+        "id": "edcb38ad.17a0a8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2201,
-        "y": 1262,
-        "z": "ab59e982.86c81",
+        "x": 2245.566650390625,
+        "y": 1276.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "3d6b9433.a347bc"
+                "10a3f078.2aa84"
             ]
         ]
     },
     {
-        "id": "3d6b9433.a347bc",
+        "id": "10a3f078.2aa84",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2415,
-        "y": 1262,
-        "z": "ab59e982.86c81",
+        "x": 2459.566650390625,
+        "y": 1276.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "308a9211.a77236",
+        "id": "8c80417d.32f06",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2089,
-        "y": 1166,
-        "z": "ab59e982.86c81",
+        "x": 2133.566650390625,
+        "y": 1180.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "190bbee0.fdc3a1",
+        "id": "36577996.f92cc6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1877,
-        "y": 1160,
-        "z": "ab59e982.86c81",
+        "x": 1921.566650390625,
+        "y": 1174.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "308a9211.a77236"
+                "8c80417d.32f06"
             ]
         ]
     },
     {
-        "id": "1bd30175.73854f",
+        "id": "eb1da6e2.d6cac",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2333,
-        "y": 1192,
-        "z": "ab59e982.86c81",
+        "x": 2377.566650390625,
+        "y": 1206.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "9e7d0c9c.28922"
+                "4f91088c.aa2a9"
             ]
         ]
     },
     {
-        "id": "9261980e.04515",
+        "id": "90fd9019.34d388",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2489,
-        "y": 1208,
-        "z": "ab59e982.86c81",
+        "x": 2533.566650390625,
+        "y": 1222.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "9e7d0c9c.28922",
+        "id": "4f91088c.aa2a9",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 2537,
-        "y": 1160,
-        "z": "ab59e982.86c81",
+        "x": 2581.566650390625,
+        "y": 1174.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "363053e.3c7802c",
+        "id": "d00a834c.9393c8",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",
         "comments": "",
-        "x": 423.99993896484375,
-        "y": 3813.000244140625,
-        "z": "ab59e982.86c81",
+        "x": 468.56658935546875,
+        "y": 3827.566909790039,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "322c901e.38e458",
+        "id": "da9884fe.c1ab2",
         "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": 463,
-        "y": 898,
-        "z": "ab59e982.86c81",
+        "x": 507.566650390625,
+        "y": 912.5666656494141,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "e500131.d3db37",
+        "id": "ef30d7fa.1abd9",
         "type": "set",
         "name": "set srcTtp+dstTtp pair",
         "xml": "<set>\n<parameter name='tmp.srcTtpdstTtpPair' value=\"`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id + ',' +\n                                               $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`\" />\n\n\n",
         "comments": "",
-        "x": 1528,
-        "y": 1251,
-        "z": "ab59e982.86c81",
+        "x": 1572.566650390625,
+        "y": 1265.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "ac5e1496.5bc93",
+        "id": "95800647.4aa41",
         "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": 1719.9999694824219,
-        "y": 1349,
-        "z": "ab59e982.86c81",
+        "x": 1764.5666198730469,
+        "y": 1363.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "b4245913.ae7bb",
+        "id": "ba078fb1.cbb95",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$tmp.access-provider-id`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n",
         "comments": "",
-        "x": 1592,
-        "y": 1302,
-        "z": "ab59e982.86c81",
+        "x": 1636.566650390625,
+        "y": 1316.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "6299b58a.3a41b4",
+        "id": "84e1fc7d.aa5158",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1401,
-        "y": 1503,
-        "z": "ab59e982.86c81",
+        "x": 1445.566650390625,
+        "y": 1517.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "2ae1d3e2.c44d5c",
-                "7342444f.5f3ea4"
+                "e1b1a2e3.c8a22",
+                "a1f3f094.cf6868"
             ]
         ]
     },
     {
-        "id": "2ae1d3e2.c44d5c",
+        "id": "e1b1a2e3.c8a22",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1687,
-        "y": 2322,
-        "z": "ab59e982.86c81",
+        "x": 1731.566650390625,
+        "y": 2336.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "27e9b59e.2795c2"
+                "877d2c40.229dc8"
             ]
         ]
     },
     {
-        "id": "8ba690d8.c6505",
+        "id": "9881a97f.aa45c",
         "type": "comment",
         "name": "call string.contains to check if the cache has srcTtpdstTtpPair",
         "info": "if it had: then no new otn/vpn-binding is needed\n           ==> find the otn. ==>look into the relationships of this connectivity and find the one that has same srcTtp and dstTtp\n           ==> increase the bw\nif not, create a new vpn-binding, attach this vpn-binding into the founded connectivity, and attach it to the middle-man-conn as well.",
         "comments": "",
-        "x": 2113,
-        "y": 2267,
-        "z": "ab59e982.86c81",
+        "x": 2157.566650390625,
+        "y": 2281.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "6f1cf403.6bf7dc",
+        "id": "8313a95b.4655",
         "type": "comment",
         "name": "create a new connectivity - (for dummy connectivity)",
         "info": "(this should not be for LEAF side or ROOT side, otherwise error)\n\ncreate a new vpn-binding (done here)\ncreate a new connectivity (done below)\nadd srcTtpdstTtpPair into the cache in this connectivity\nattach the vpn-binding into the connectivity relationship\nattach this connectivity into the middle man\nattach this connectivity into the service-instance",
         "comments": "",
-        "x": 1979.9999694824219,
-        "y": 1465,
-        "z": "ab59e982.86c81",
+        "x": 2024.5666198730469,
+        "y": 1479.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "570cc158.1e1d08",
+        "id": "298356b2.691352",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$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\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2027,
-        "y": 1515,
-        "z": "ab59e982.86c81",
+        "x": 2071.566650390625,
+        "y": 1529.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "e9e323ca.2e498"
+                "594dfec1.070b58"
             ]
         ]
     },
     {
-        "id": "e9e323ca.2e498",
+        "id": "594dfec1.070b58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2315,
-        "y": 1516,
-        "z": "ab59e982.86c81",
+        "x": 2359.566650390625,
+        "y": 1530.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "f5fef51a.3d04f8"
+                "20be2b7.b4b9054"
             ]
         ]
     },
     {
-        "id": "f5fef51a.3d04f8",
+        "id": "20be2b7.b4b9054",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2498.5,
-        "y": 1514.25390625,
-        "z": "ab59e982.86c81",
+        "x": 2543.066650390625,
+        "y": 1528.820571899414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "12f528da.eadc7f",
+        "id": "48aaf3f8.b9dde4",
         "type": "execute",
         "name": "execute string.contains srcTtpdstTtpPair",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n<parameter name=\"source\" value='`$tmp.the-connectivity.coupling-flag`'/>\n<parameter name=\"target\" value=\"`$tmp.srcTtpdstTtpPair`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2101,
-        "y": 2319,
-        "z": "ab59e982.86c81",
+        "x": 2145.566650390625,
+        "y": 2333.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "8dd1e788.b5dd4",
-                "6a3cb15d.6fc0f8"
+                "5fc5edcc.a33e6c",
+                "1c8fc333.3d53cd"
             ]
         ]
     },
     {
-        "id": "8dd1e788.b5dd4",
+        "id": "5fc5edcc.a33e6c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2274,
-        "y": 2167,
-        "z": "ab59e982.86c81",
+        "x": 2318.566650390625,
+        "y": 2181.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a3cb15d.6fc0f8",
+        "id": "1c8fc333.3d53cd",
         "type": "outcomeFalse",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2306,
-        "y": 2426,
-        "z": "ab59e982.86c81",
+        "x": 2350.566650390625,
+        "y": 2440.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "7ecab95b.cd5a18"
+                "7733ea37.676d94"
             ]
         ]
     },
     {
-        "id": "82bc647c.2cf778",
+        "id": "94ea5f1c.00084",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$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\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2713,
-        "y": 1957,
-        "z": "ab59e982.86c81",
+        "x": 2757.566650390625,
+        "y": 1971.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "6754cf0f.d24068"
+                "ee79eb28.dfce98"
             ]
         ]
     },
     {
-        "id": "6754cf0f.d24068",
+        "id": "ee79eb28.dfce98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3017,
-        "y": 1954,
-        "z": "ab59e982.86c81",
+        "x": 3061.566650390625,
+        "y": 1968.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "a854224c.98a058"
+                "cd827e2b.fca8e"
             ]
         ]
     },
     {
-        "id": "a854224c.98a058",
+        "id": "cd827e2b.fca8e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3167.5,
-        "y": 1961.25390625,
-        "z": "ab59e982.86c81",
+        "x": 3212.066650390625,
+        "y": 1975.820571899414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "87b5ce3b.8ef938",
+        "id": "6a2d9e1e.0984a",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2007,
-        "y": 1570,
-        "z": "ab59e982.86c81",
+        "x": 2051.566650390625,
+        "y": 1584.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a69c0c.0beb14",
+        "id": "6f0be409.bf59b4",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1945,
-        "y": 1620,
-        "z": "ab59e982.86c81",
+        "x": 1989.566650390625,
+        "y": 1634.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4e3ab7a.498dc8",
+        "id": "f8e04437.c053b8",
         "type": "save",
         "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2046,
-        "y": 1665,
-        "z": "ab59e982.86c81",
+        "x": 2090.566650390625,
+        "y": 1679.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "909dac00.1cdf4",
+        "id": "83b33842.f7a008",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 2082,
-        "y": 1719,
-        "z": "ab59e982.86c81",
+        "x": 2126.566650390625,
+        "y": 1733.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "30650806.4cf508",
+        "id": "665710a0.10b6d",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2050,
-        "y": 1778,
-        "z": "ab59e982.86c81",
+        "x": 2094.566650390625,
+        "y": 1792.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "a06d70ba.206bf",
+        "id": "50815aa.2966624",
         "type": "comment",
         "name": "find middle-man's eth-srv-name",
         "info": "",
         "comments": "",
-        "x": 1508,
-        "y": 1394,
-        "z": "ab59e982.86c81",
+        "x": 1552.566650390625,
+        "y": 1408.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "6cd61101.45105",
+        "id": "4be74bfa.e8a9a4",
         "type": "set",
         "name": "set prop.ethernet-service-name",
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",
         "comments": "",
-        "x": 1530,
-        "y": 1438,
-        "z": "ab59e982.86c81",
+        "x": 1574.566650390625,
+        "y": 1452.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "78936cec.4008d4",
+        "id": "7bee4ebc.b72be8",
         "type": "save",
         "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2737,
-        "y": 2174,
-        "z": "ab59e982.86c81",
+        "x": 2781.566650390625,
+        "y": 2188.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "8c815ed6.372fa",
+        "id": "2dce7211.24f81e",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 2768,
-        "y": 2213,
-        "z": "ab59e982.86c81",
+        "x": 2812.566650390625,
+        "y": 2227.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "add6fed7.67e35",
+        "id": "90bd55a8.2fdfb",
         "type": "save",
         "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2739,
-        "y": 2286,
-        "z": "ab59e982.86c81",
+        "x": 2783.566650390625,
+        "y": 2300.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "8ad8acf7.e8e67",
+        "id": "7a94ba19.d3678c",
         "type": "comment",
         "name": "update the founded connectivity to have a new coupling-flag",
         "info": "",
         "comments": "",
-        "x": 2709,
-        "y": 2002,
-        "z": "ab59e982.86c81",
+        "x": 2753.566650390625,
+        "y": 2016.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "8ca2b693.c50608",
+        "id": "1f39716d.08bb37",
         "type": "set",
         "name": "set newFlag",
         "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",
         "comments": "",
-        "x": 2595,
-        "y": 2041,
-        "z": "ab59e982.86c81",
+        "x": 2639.566650390625,
+        "y": 2055.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "9f51b095.94fd08",
+        "id": "966d5b58.b138c",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2659,
-        "y": 2086,
-        "z": "ab59e982.86c81",
+        "x": 2703.566650390625,
+        "y": 2100.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "58d04196.f5778",
+        "id": "3ca218f1.e24728",
         "type": "comment",
         "name": "the following two relationships should have already been there; if not => error",
         "info": "",
         "comments": "",
-        "x": 2751,
-        "y": 2136,
-        "z": "ab59e982.86c81",
+        "x": 2795.566650390625,
+        "y": 2150.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "832e8c75.f85478",
+        "id": "533f0d90.da6154",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1737,
-        "y": 1503,
-        "z": "ab59e982.86c81",
+        "x": 1781.566650390625,
+        "y": 1517.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "570cc158.1e1d08",
-                "87b5ce3b.8ef938",
-                "6a69c0c.0beb14",
-                "a4e3ab7a.498dc8",
-                "909dac00.1cdf4",
-                "30650806.4cf508"
+                "298356b2.691352",
+                "6a2d9e1e.0984a",
+                "6f0be409.bf59b4",
+                "f8e04437.c053b8",
+                "83b33842.f7a008",
+                "665710a0.10b6d"
             ]
         ]
     },
     {
-        "id": "7342444f.5f3ea4",
+        "id": "a1f3f094.cf6868",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1599,
-        "y": 1499,
-        "z": "ab59e982.86c81",
+        "x": 1643.566650390625,
+        "y": 1513.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "832e8c75.f85478"
+                "533f0d90.da6154"
             ]
         ]
     },
     {
-        "id": "27e9b59e.2795c2",
+        "id": "877d2c40.229dc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2397,
-        "y": 1966,
-        "z": "ab59e982.86c81",
+        "x": 2441.566650390625,
+        "y": 1980.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "82bc647c.2cf778",
-                "8ca2b693.c50608",
-                "9f51b095.94fd08",
-                "add6fed7.67e35"
+                "94ea5f1c.00084",
+                "1f39716d.08bb37",
+                "966d5b58.b138c",
+                "90bd55a8.2fdfb"
             ]
         ]
     },
     {
-        "id": "ddcfbda0.672cc",
+        "id": "921c2635.2657",
         "type": "comment",
         "name": "loop through the relationships of this founded connectivity, then",
         "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",
         "comments": "",
-        "x": 2402,
-        "y": 2391,
-        "z": "ab59e982.86c81",
+        "x": 2446.566650390625,
+        "y": 2405.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "86c04fbf.f3fdf8",
+        "id": "2a3dc4da.d825f4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2744,
-        "y": 2427,
-        "z": "ab59e982.86c81",
+        "x": 2788.566650390625,
+        "y": 2441.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "d9d55075.06cb88"
+                "736b385a.35da7"
             ]
         ]
     },
     {
-        "id": "d9d55075.06cb88",
+        "id": "736b385a.35da7",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2956,
-        "y": 2425,
-        "z": "ab59e982.86c81",
+        "x": 3000.566650390625,
+        "y": 2439.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "b5809f3c.79c17"
+                "e66ec218.e79bc"
             ]
         ]
     },
     {
-        "id": "b5809f3c.79c17",
+        "id": "e66ec218.e79bc",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3140,
-        "y": 2423,
-        "z": "ab59e982.86c81",
+        "x": 3184.566650390625,
+        "y": 2437.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "17f341d4.56b9ee"
+                "8c204db5.df1ea"
             ]
         ]
     },
     {
-        "id": "17f341d4.56b9ee",
+        "id": "8c204db5.df1ea",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3319,
-        "y": 2428,
-        "z": "ab59e982.86c81",
+        "x": 3363.566650390625,
+        "y": 2442.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "77bff99b.403968",
-                "813820e1.d9db2"
+                "750b8345.e6107c",
+                "b2411873.31b798"
             ]
         ]
     },
     {
-        "id": "813820e1.d9db2",
+        "id": "b2411873.31b798",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 3536,
-        "y": 2359,
-        "z": "ab59e982.86c81",
+        "x": 3580.566650390625,
+        "y": 2373.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "77bff99b.403968",
+        "id": "750b8345.e6107c",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3529,
-        "y": 2445,
-        "z": "ab59e982.86c81",
+        "x": 3573.566650390625,
+        "y": 2459.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "574e7a35.7acb64",
-                "72ff429d.0f84dc",
-                "d88724e6.b16bd8"
+                "bdf485ca.827e58",
+                "ed90443b.6fe53",
+                "a94ce9b.8c46898"
             ]
         ]
     },
     {
-        "id": "72ff429d.0f84dc",
+        "id": "ed90443b.6fe53",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3742.490966796875,
-        "y": 2429.5740356445312,
-        "z": "ab59e982.86c81",
+        "x": 3787.0576171875,
+        "y": 2444.1407012939453,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "47df6bef.c00ec4"
+                "1ae663bf.60e5d4"
             ]
         ]
     },
     {
-        "id": "47df6bef.c00ec4",
+        "id": "1ae663bf.60e5d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3905.0625,
-        "y": 2428.8597412109375,
-        "z": "ab59e982.86c81",
+        "x": 3949.629150390625,
+        "y": 2443.4264068603516,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "25a6a90d.740966",
+        "id": "4b566804.b29878",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3906,
-        "y": 2474,
-        "z": "ab59e982.86c81",
+        "x": 3950.566650390625,
+        "y": 2488.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "d88724e6.b16bd8",
+        "id": "a94ce9b.8c46898",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3738,
-        "y": 2474,
-        "z": "ab59e982.86c81",
+        "x": 3782.566650390625,
+        "y": 2488.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "25a6a90d.740966"
+                "4b566804.b29878"
             ]
         ]
     },
     {
-        "id": "574e7a35.7acb64",
+        "id": "bdf485ca.827e58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3740,
-        "y": 2534,
-        "z": "ab59e982.86c81",
+        "x": 3784.566650390625,
+        "y": 2548.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "fafaf735.33502"
+                "e92643e6.dea4d"
             ]
         ]
     },
     {
-        "id": "fafaf735.33502",
+        "id": "e92643e6.dea4d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3909,
-        "y": 2533,
-        "z": "ab59e982.86c81",
+        "x": 3953.566650390625,
+        "y": 2547.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "dbd3b6f8.ffc688"
+                "8f8a5cb3.af8a3"
             ]
         ]
     },
     {
-        "id": "7ecab95b.cd5a18",
+        "id": "7733ea37.676d94",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2533,
-        "y": 2425,
-        "z": "ab59e982.86c81",
+        "x": 2577.566650390625,
+        "y": 2439.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "86c04fbf.f3fdf8",
-                "3d93e24d.201056",
-                "18210d7a.52f32b"
+                "2a3dc4da.d825f4",
+                "9b2ffd1b.3a96e",
+                "6fbcac88.0e9a54"
             ]
         ]
     },
     {
-        "id": "dbd3b6f8.ffc688",
+        "id": "8f8a5cb3.af8a3",
         "type": "switchNode",
         "name": "switch srcTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4108,
-        "y": 2534,
-        "z": "ab59e982.86c81",
+        "x": 4152.566650390625,
+        "y": 2548.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "f13865e2.850a98"
+                "bc9f47cc.0b96"
             ]
         ]
     },
     {
-        "id": "f13865e2.850a98",
+        "id": "bc9f47cc.0b96",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4271,
-        "y": 2532,
-        "z": "ab59e982.86c81",
+        "x": 4315.566650390625,
+        "y": 2546.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "9cbb1279.26e6c"
+                "566fa06e.e1e238"
             ]
         ]
     },
     {
-        "id": "9cbb1279.26e6c",
+        "id": "566fa06e.e1e238",
         "type": "switchNode",
         "name": "switch dstTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4452,
-        "y": 2532,
-        "z": "ab59e982.86c81",
+        "x": 4496.566650390625,
+        "y": 2546.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "9f041833.a96178"
+                "f4daf0bd.af9d9"
             ]
         ]
     },
     {
-        "id": "9f041833.a96178",
+        "id": "f4daf0bd.af9d9",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4615,
-        "y": 2530,
-        "z": "ab59e982.86c81",
+        "x": 4659.566650390625,
+        "y": 2544.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "7a99f43e.47072c"
+                "c0c49b50.2a7748"
             ]
         ]
     },
     {
-        "id": "3d307538.ff5302",
+        "id": "562992d6.b870dc",
         "type": "set",
         "name": "set tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",
         "comments": "",
-        "x": 4972,
-        "y": 2537,
-        "z": "ab59e982.86c81",
+        "x": 5016.566650390625,
+        "y": 2551.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "7a99f43e.47072c",
+        "id": "c0c49b50.2a7748",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4754,
-        "y": 2529,
-        "z": "ab59e982.86c81",
+        "x": 4798.566650390625,
+        "y": 2543.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "3d307538.ff5302",
-                "9c163e19.5e2778"
+                "562992d6.b870dc",
+                "10659fb.a744fe"
             ]
         ]
     },
     {
-        "id": "9c163e19.5e2778",
+        "id": "10659fb.a744fe",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4918,
-        "y": 2581,
-        "z": "ab59e982.86c81",
+        "x": 4962.566650390625,
+        "y": 2595.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "3d93e24d.201056",
+        "id": "9b2ffd1b.3a96e",
         "type": "set",
         "name": "unset tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2754,
-        "y": 2388,
-        "z": "ab59e982.86c81",
+        "x": 2798.566650390625,
+        "y": 2402.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "ad919177.04496",
+        "id": "9d592730.4455b8",
         "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": 2843,
-        "y": 2562,
-        "z": "ab59e982.86c81",
+        "x": 2887.566650390625,
+        "y": 2576.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "18210d7a.52f32b",
+        "id": "6fbcac88.0e9a54",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`($tmp.the-vpn-binding.customer-vpn-id + $gfp)`' />\n\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2813,
-        "y": 2622,
-        "z": "ab59e982.86c81",
+        "x": 2857.566650390625,
+        "y": 2636.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "af2be5de.84caa8",
+        "id": "5d4c8b88.6ea084",
         "type": "switchNode",
         "name": "switch otninfoProtect exists",
         "xml": "<switch test=\"`$tmp.otninfoProtect_length > 0`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 579.1166381835938,
-        "y": 2488,
-        "z": "ab59e982.86c81",
+        "x": 623.6832885742188,
+        "y": 2502.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "bdb88dff.a2cfc8"
+                "b304b119.fc6c6"
             ]
         ]
     },
     {
-        "id": "bdb88dff.a2cfc8",
+        "id": "b304b119.fc6c6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 800.1166381835938,
-        "y": 2489,
-        "z": "ab59e982.86c81",
+        "x": 844.6832885742188,
+        "y": 2503.566665649414,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "62f58207.69b144"
+                "929a93b0.fb26e"
             ]
         ]
     },
     {
-        "id": "4da32200.1a505",
+        "id": "1365d05a.43ccb8",
         "type": "for",
         "name": "for vidx..tmp.otninfoProtect_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfoProtect_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 615.6666870117188,
-        "y": 3269.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 660.2333374023438,
+        "y": 3284.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "78d123a7.ebdd04"
+                "d491584d.33cd28"
             ]
         ]
     },
     {
-        "id": "78d123a7.ebdd04",
+        "id": "d491584d.33cd28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 875.6666564941406,
-        "y": 3262.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 920.2333068847656,
+        "y": 3277.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "655b0cf9.434f14",
-                "2cbd342f.008e4c",
-                "af443653.16e2a",
-                "b4328c41.7c5e68",
-                "54752c5a.7588d4",
-                "88c79ac5.392298",
-                "f442f477.1b9ac",
-                "1b1a37df.8ffb38",
-                "40d5cce.138f1b4",
-                "17ca39fd.1576de"
+                "252a570f.f396c8",
+                "f0403523.cecec",
+                "53ad6d75.3e9854",
+                "61d4cb78.58331c",
+                "d81f3e39.a99398",
+                "57f2e473.517f54",
+                "c1b2a740.d37fa",
+                "34621460.796344",
+                "5ed2002c.80ebf8",
+                "6dfdf88f.4bb6c"
             ]
         ]
     },
     {
-        "id": "2cbd342f.008e4c",
+        "id": "f0403523.cecec",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1264.6666870117188,
-        "y": 2931.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1309.2333374023438,
+        "y": 2946.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "390f0f63.f5713",
-                "a481fb54.252848"
+                "a19e39b9.f8da1",
+                "f567fdff.bdc4a8"
             ]
         ]
     },
     {
-        "id": "a481fb54.252848",
+        "id": "f567fdff.bdc4a8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1631.6666870117188,
-        "y": 2938.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1676.2333374023438,
+        "y": 2953.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "accd9965.551cc"
+                "4918f2b6.cf40ac"
             ]
         ]
     },
     {
-        "id": "accd9965.551cc",
+        "id": "4918f2b6.cf40ac",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 1842.6666870117188,
-        "y": 2936.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1887.2333374023438,
+        "y": 2951.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "af443653.16e2a",
+        "id": "53ad6d75.3e9854",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 1440.6666870117188,
-        "y": 3005.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1485.2333374023438,
+        "y": 3020.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "b4328c41.7c5e68",
+        "id": "61d4cb78.58331c",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1484.6666870117188,
-        "y": 3053.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1529.2333374023438,
+        "y": 3068.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "2ab1cad2.cc8df6",
-                "95061116.66953",
-                "d118596c.c8a1b"
+                "c8e35acd.0cd338",
+                "1a3bc3e9.de0b6c",
+                "d9c66705.f174c8"
             ]
         ]
     },
     {
-        "id": "2ab1cad2.cc8df6",
+        "id": "c8e35acd.0cd338",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1697.1666870117188,
-        "y": 3000.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1741.7333374023438,
+        "y": 3015.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "9a46b094.250a1"
+                "b0542ad9.f9bdf8"
             ]
         ]
     },
     {
-        "id": "95061116.66953",
+        "id": "1a3bc3e9.de0b6c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1709.1666870117188,
-        "y": 3050.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1753.7333374023438,
+        "y": 3065.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "a8bbbf3c.490288"
+                "6126bc5c.e48684"
             ]
         ]
     },
     {
-        "id": "d118596c.c8a1b",
+        "id": "d9c66705.f174c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1700.1666870117188,
-        "y": 3105.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1744.7333374023438,
+        "y": 3120.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "c4cf4a50.357dd"
+                "bc3263f3.ac82e"
             ]
         ]
     },
     {
-        "id": "c4cf4a50.357dd",
+        "id": "bc3263f3.ac82e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1845.1666870117188,
-        "y": 3104.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1889.7333374023438,
+        "y": 3119.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "a8bbbf3c.490288",
+        "id": "6126bc5c.e48684",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1856.1666870117188,
-        "y": 3047.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1900.7333374023438,
+        "y": 3062.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "9a46b094.250a1",
+        "id": "b0542ad9.f9bdf8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1822.5491333007812,
-        "y": 2994.5555725097656,
-        "z": "ab59e982.86c81",
+        "x": 1867.1157836914062,
+        "y": 3009.1222381591797,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "8c15c7c0.68b978"
+                "fcdf9d8b.4643d"
             ]
         ]
     },
     {
-        "id": "8c15c7c0.68b978",
+        "id": "fcdf9d8b.4643d",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1983.6666870117188,
-        "y": 3008.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2028.2333374023438,
+        "y": 3023.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "a8c602fe.1de83"
+                "d8f6f412.7d192"
             ]
         ]
     },
     {
-        "id": "a8c602fe.1de83",
+        "id": "d8f6f412.7d192",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2178.6666870117188,
-        "y": 3008.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2223.2333374023438,
+        "y": 3023.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "92605acf.b6eae"
+                "513cd183.70a36"
             ]
         ]
     },
     {
-        "id": "3d5fc5da.8209c2",
+        "id": "16c3d135.367537",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2558.6666870117188,
-        "y": 3004.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2603.2333374023438,
+        "y": 3019.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "f1e62050.aa9b48",
-                "142adcaa.53768b"
+                "8f09a3ce.bb8bc8",
+                "42328e66.9a179"
             ]
         ]
     },
     {
-        "id": "142adcaa.53768b",
+        "id": "42328e66.9a179",
         "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": 2766.6666870117188,
-        "y": 3011.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2811.2333374023438,
+        "y": 3026.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "b0f57546.a572f8",
-                "f4d8ee18.503d6",
-                "6cf185fa.032e7c"
+                "2a95e8b.71c7818",
+                "8cd4441d.84eb48",
+                "2f9a0731.3058d8"
             ]
         ]
     },
     {
-        "id": "f1e62050.aa9b48",
+        "id": "8f09a3ce.bb8bc8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2796.6666870117188,
-        "y": 2959.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2841.2333374023438,
+        "y": 2974.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "b0f57546.a572f8",
+        "id": "2a95e8b.71c7818",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2976.6666870117188,
-        "y": 3002.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3021.2333374023438,
+        "y": 3017.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "8af042ca.abce2"
+                "bb0632bc.6bdea8"
             ]
         ]
     },
     {
-        "id": "f4d8ee18.503d6",
+        "id": "8cd4441d.84eb48",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2968.6666870117188,
-        "y": 3057.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3013.2333374023438,
+        "y": 3072.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "14e1063f.bcaa12"
+                "fee906e6.a31e28"
             ]
         ]
     },
     {
-        "id": "6cf185fa.032e7c",
+        "id": "2f9a0731.3058d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2973.6666870117188,
-        "y": 3114.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3018.2333374023438,
+        "y": 3129.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "88d269ff.2a4e78"
+                "b7732316.bbeb1"
             ]
         ]
     },
     {
-        "id": "88d269ff.2a4e78",
+        "id": "b7732316.bbeb1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3125.6666870117188,
-        "y": 3115.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3170.2333374023438,
+        "y": 3130.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "14e1063f.bcaa12",
+        "id": "fee906e6.a31e28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3136.6666870117188,
-        "y": 3060.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3181.2333374023438,
+        "y": 3075.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "8af042ca.abce2",
+        "id": "bb0632bc.6bdea8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3121.0490112304688,
-        "y": 3000.5555725097656,
-        "z": "ab59e982.86c81",
+        "x": 3165.6156616210938,
+        "y": 3015.1222381591797,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "6ee06c7f.e87634"
+                "f496005b.73025"
             ]
         ]
     },
     {
-        "id": "92605acf.b6eae",
+        "id": "513cd183.70a36",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2381.6666870117188,
-        "y": 3012.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2426.2333374023438,
+        "y": 3027.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "3d5fc5da.8209c2"
+                "16c3d135.367537"
             ]
         ]
     },
     {
-        "id": "6ee06c7f.e87634",
+        "id": "f496005b.73025",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3335.6666870117188,
-        "y": 2996.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3380.2333374023438,
+        "y": 3011.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "54752c5a.7588d4",
+        "id": "d81f3e39.a99398",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1454.6666870117188,
-        "y": 3222.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1499.2333374023438,
+        "y": 3237.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "a23826d9.6cbf8",
-                "ca79965c.c43c5"
+                "f53e378b.14151",
+                "e638c491.631368"
             ]
         ]
     },
     {
-        "id": "a23826d9.6cbf8",
+        "id": "f53e378b.14151",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1655.6666870117188,
-        "y": 3220.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1700.2333374023438,
+        "y": 3235.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "1188399c.8e417e"
+                "7fd6322b.5362bc"
             ]
         ]
     },
     {
-        "id": "5f0d00e5.7b1628",
+        "id": "f8356e69.4561c",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 1936.6666870117188,
-        "y": 3170.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1981.2333374023438,
+        "y": 3185.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "f4e7389.48dcac8",
+        "id": "4191bf2c.16bd58",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainC)",
         "xml": "<switch test='`$otnidx == $tmp.otninfoProtect_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1872.6666870117188,
-        "y": 3271.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1917.2333374023438,
+        "y": 3286.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "1eeda518.bbd863",
-                "25bb7e68.eed552"
+                "93d13951.14dd18",
+                "fa75dc08.2eaf8"
             ]
         ]
     },
     {
-        "id": "1eeda518.bbd863",
+        "id": "93d13951.14dd18",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2102.6666870117188,
-        "y": 3267.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2147.2333374023438,
+        "y": 3282.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "19cc5bd6.d13bb4"
+                "8d4bef0b.6a0fe8"
             ]
         ]
     },
     {
-        "id": "ca79965c.c43c5",
+        "id": "e638c491.631368",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1655.6666870117188,
-        "y": 3269.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1700.2333374023438,
+        "y": 3284.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "f4e7389.48dcac8"
+                "4191bf2c.16bd58"
             ]
         ]
     },
     {
-        "id": "25bb7e68.eed552",
+        "id": "fa75dc08.2eaf8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2103.6666870117188,
-        "y": 3313.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2148.2333374023438,
+        "y": 3328.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "ff457a93.22142"
+                "5bb88da7.4d8694"
             ]
         ]
     },
     {
-        "id": "ff457a93.22142",
+        "id": "5bb88da7.4d8694",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2317.6666870117188,
-        "y": 3313.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2362.2333374023438,
+        "y": 3328.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "a5bfc25b.24a798",
+        "id": "6729c928.c3b6c",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 1991.6666870117188,
-        "y": 3217.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2036.2333374023438,
+        "y": 3232.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "1188399c.8e417e",
+        "id": "7fd6322b.5362bc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1779.6666870117188,
-        "y": 3211.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1824.2333374023438,
+        "y": 3226.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "a5bfc25b.24a798"
+                "6729c928.c3b6c"
             ]
         ]
     },
     {
-        "id": "19cc5bd6.d13bb4",
+        "id": "8d4bef0b.6a0fe8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2235.6666870117188,
-        "y": 3243.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2280.2333374023438,
+        "y": 3258.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "ecfd7b03.8cb46"
+                "e3feca80.0e5828"
             ]
         ]
     },
     {
-        "id": "f9df9d2f.f6b57",
+        "id": "e95f7eb5.2af0b8",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2391.6666870117188,
-        "y": 3259.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2436.2333374023438,
+        "y": 3274.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "ecfd7b03.8cb46",
+        "id": "e3feca80.0e5828",
         "type": "set",
         "name": "set attachment_param domain C",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />",
         "comments": "",
-        "x": 2439.6666870117188,
-        "y": 3211.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2484.2333374023438,
+        "y": 3226.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "88c79ac5.392298",
+        "id": "57f2e473.517f54",
         "type": "set",
         "name": "set srcTtp+dstTtp pair",
         "xml": "<set>\n<parameter name='tmp.srcTtpdstTtpPair' value=\"`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id + ',' +\n                                               $tmp.otninfootninfoProtect.dstPort.dst-tunnel-tp-id`\" />\n\n\n",
         "comments": "",
-        "x": 1430.6666870117188,
-        "y": 3302.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1475.2333374023438,
+        "y": 3317.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "1b1a37df.8ffb38",
+        "id": "34621460.796344",
         "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": 1622.6666564941406,
-        "y": 3400.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1667.2333068847656,
+        "y": 3415.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "f442f477.1b9ac",
+        "id": "c1b2a740.d37fa",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$tmp.access-provider-id`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n",
         "comments": "",
-        "x": 1494.6666870117188,
-        "y": 3353.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1539.2333374023438,
+        "y": 3368.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "40d5cce.138f1b4",
+        "id": "5ed2002c.80ebf8",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1303.6666870117188,
-        "y": 3554.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1348.2333374023438,
+        "y": 3569.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "e841833f.a5b018",
-                "1d9dc789.fabfa"
+                "3ba1da7b.60657e",
+                "5bde363c.523c48"
             ]
         ]
     },
     {
-        "id": "e841833f.a5b018",
+        "id": "3ba1da7b.60657e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1589.6666870117188,
-        "y": 4373.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1634.2333374023438,
+        "y": 4388.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "5f9745ba.8cabdc"
+                "c5f8d573.741818"
             ]
         ]
     },
     {
-        "id": "40e5d82c.0988c",
+        "id": "cfba9c01.06834",
         "type": "comment",
         "name": "call string.contains to check if the cache has srcTtpdstTtpPair",
         "info": "if it had: then no new otn/vpn-binding is needed\n           ==> find the otn. ==>look into the relationships of this connectivity and find the one that has same srcTtp and dstTtp\n           ==> increase the bw\nif not, create a new vpn-binding, attach this vpn-binding into the founded connectivity, and attach it to the middle-man-conn as well.",
         "comments": "",
-        "x": 2015.6666870117188,
-        "y": 4318.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2060.2333374023438,
+        "y": 4333.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "37b719a7.3177d6",
+        "id": "d5ee8376.6d7b3",
         "type": "comment",
         "name": "create a new connectivity - (for dummy connectivity)",
         "info": "(this should not be for LEAF side or ROOT side, otherwise error)\n\ncreate a new vpn-binding (done here)\ncreate a new connectivity (done below)\nadd srcTtpdstTtpPair into the cache in this connectivity\nattach the vpn-binding into the connectivity relationship\nattach this connectivity into the middle man\nattach this connectivity into the service-instance",
         "comments": "",
-        "x": 1882.6666564941406,
-        "y": 3516.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1927.2333068847656,
+        "y": 3531.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "f0f8f4ff.e42fa",
+        "id": "7d7a6dc.ff5ab14",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$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\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1929.6666870117188,
-        "y": 3566.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1974.2333374023438,
+        "y": 3581.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "37e8875.87c3378"
+                "770ec83d.f5f698"
             ]
         ]
     },
     {
-        "id": "37e8875.87c3378",
+        "id": "770ec83d.f5f698",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2217.6666870117188,
-        "y": 3567.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2262.2333374023438,
+        "y": 3582.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "90a3277d.c4bfc"
+                "1ea6c507.8eb3c3"
             ]
         ]
     },
     {
-        "id": "90a3277d.c4bfc",
+        "id": "1ea6c507.8eb3c3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2401.1666870117188,
-        "y": 3566.15380859375,
-        "z": "ab59e982.86c81",
+        "x": 2445.7333374023438,
+        "y": 3580.720474243164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b046e56.9a1b9",
+        "id": "4b1e068c.b603",
         "type": "execute",
         "name": "execute string.contains srcTtpdstTtpPair",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n<parameter name=\"source\" value='`$tmp.the-connectivity.coupling-flag`'/>\n<parameter name=\"target\" value=\"`$tmp.srcTtpdstTtpPair`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2003.6666870117188,
-        "y": 4370.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2048.2333374023438,
+        "y": 4385.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "779ce37e.93a47c",
-                "f1f0cfe.10d413"
+                "fa23bfea.633fa",
+                "5640420c.c8d724"
             ]
         ]
     },
     {
-        "id": "779ce37e.93a47c",
+        "id": "fa23bfea.633fa",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2176.6666870117188,
-        "y": 4218.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2221.2333374023438,
+        "y": 4233.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1f0cfe.10d413",
+        "id": "5640420c.c8d724",
         "type": "outcomeFalse",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2208.6666870117188,
-        "y": 4477.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2253.2333374023438,
+        "y": 4492.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "9f0cdaa9.449a9"
+                "745b8702.06258"
             ]
         ]
     },
     {
-        "id": "58dad5a1.4283d4",
+        "id": "566a0421.e07abc",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$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\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2615.6666870117188,
-        "y": 4008.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2660.2333374023438,
+        "y": 4023.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "ca0562a9.f9dfa"
+                "e7e1a1af.83dc9"
             ]
         ]
     },
     {
-        "id": "ca0562a9.f9dfa",
+        "id": "e7e1a1af.83dc9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2919.6666870117188,
-        "y": 4005.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2964.2333374023438,
+        "y": 4020.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "21917e0f.61cb02"
+                "9e39afad.724988"
             ]
         ]
     },
     {
-        "id": "21917e0f.61cb02",
+        "id": "9e39afad.724988",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3070.1666870117188,
-        "y": 4013.15380859375,
-        "z": "ab59e982.86c81",
+        "x": 3114.7333374023438,
+        "y": 4027.720474243164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "c456d560.e56b4",
+        "id": "5fd9a93f.71f3e",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1909.6666870117188,
-        "y": 3621.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1954.2333374023438,
+        "y": 3636.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "1c6b3c2b.a8cfe4",
+        "id": "e99e1220.c8d158",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1847.6666870117188,
-        "y": 3671.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1892.2333374023438,
+        "y": 3686.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "883e63bc.f1bf9",
+        "id": "e74eb1dd.b1cce",
         "type": "save",
         "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1948.6666870117188,
-        "y": 3716.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1993.2333374023438,
+        "y": 3731.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "67b90a5f.a2bde4",
+        "id": "d069cfb2.559918",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 1984.6666870117188,
-        "y": 3770.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2029.2333374023438,
+        "y": 3785.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "44633bde.4c2f24",
+        "id": "db7724b7.c0b95",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1952.6666870117188,
-        "y": 3829.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1997.2333374023438,
+        "y": 3844.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "ad055e93.cbffc8",
+        "id": "dccc268f.14582",
         "type": "comment",
         "name": "find middle-man's eth-srv-name",
         "info": "",
         "comments": "",
-        "x": 1410.6666870117188,
-        "y": 3445.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1455.2333374023438,
+        "y": 3460.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "17ca39fd.1576de",
+        "id": "6dfdf88f.4bb6c",
         "type": "set",
         "name": "set prop.ethernet-service-name",
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",
         "comments": "",
-        "x": 1432.6666870117188,
-        "y": 3489.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1477.2333374023438,
+        "y": 3504.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "91cb3623.bfa508",
+        "id": "e9be22f5.c3b77",
         "type": "save",
         "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2639.6666870117188,
-        "y": 4225.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2684.2333374023438,
+        "y": 4240.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "749face3.2a032c",
+        "id": "e3ac7685.f8539",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 2670.6666870117188,
-        "y": 4264.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2715.2333374023438,
+        "y": 4279.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1e29877.e2638",
+        "id": "8511409f.51bd2",
         "type": "save",
         "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2641.6666870117188,
-        "y": 4337.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2686.2333374023438,
+        "y": 4352.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca553073.a3999",
+        "id": "65db0af6.94eaf4",
         "type": "comment",
         "name": "update the founded connectivity to have a new coupling-flag",
         "info": "",
         "comments": "",
-        "x": 2611.6666870117188,
-        "y": 4053.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2656.2333374023438,
+        "y": 4068.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "30b58e5f.9a5412",
+        "id": "537df036.3150f",
         "type": "set",
         "name": "set newFlag",
         "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",
         "comments": "",
-        "x": 2497.6666870117188,
-        "y": 4092.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2542.2333374023438,
+        "y": 4107.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "b32f2c11.a0cbd",
+        "id": "73887d45.2afa44",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2561.6666870117188,
-        "y": 4137.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2606.2333374023438,
+        "y": 4152.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "b26dba6c.6455b",
+        "id": "442047ec.b76048",
         "type": "comment",
         "name": "the following two relationships should have already been there; if not => error",
         "info": "",
         "comments": "",
-        "x": 2653.6666870117188,
-        "y": 4187.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2698.2333374023438,
+        "y": 4202.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "f615578d.11ca3",
+        "id": "a6868862.e0d7a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1639.6666870117188,
-        "y": 3554.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1684.2333374023438,
+        "y": 3569.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "f0f8f4ff.e42fa",
-                "c456d560.e56b4",
-                "1c6b3c2b.a8cfe4",
-                "883e63bc.f1bf9",
-                "67b90a5f.a2bde4",
-                "44633bde.4c2f24"
+                "7d7a6dc.ff5ab14",
+                "5fd9a93f.71f3e",
+                "e99e1220.c8d158",
+                "e74eb1dd.b1cce",
+                "d069cfb2.559918",
+                "db7724b7.c0b95"
             ]
         ]
     },
     {
-        "id": "1d9dc789.fabfa",
+        "id": "5bde363c.523c48",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1501.6666870117188,
-        "y": 3550.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1546.2333374023438,
+        "y": 3565.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "f615578d.11ca3"
+                "a6868862.e0d7a8"
             ]
         ]
     },
     {
-        "id": "5f9745ba.8cabdc",
+        "id": "c5f8d573.741818",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2299.6666870117188,
-        "y": 4017.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2344.2333374023438,
+        "y": 4032.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "58dad5a1.4283d4",
-                "30b58e5f.9a5412",
-                "b32f2c11.a0cbd",
-                "d1e29877.e2638"
+                "566a0421.e07abc",
+                "537df036.3150f",
+                "73887d45.2afa44",
+                "8511409f.51bd2"
             ]
         ]
     },
     {
-        "id": "fe407594.64cba8",
+        "id": "8b5f6b52.3288",
         "type": "comment",
         "name": "loop through the relationships of this founded connectivity, then",
         "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",
         "comments": "",
-        "x": 2304.6666870117188,
-        "y": 4442.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2349.2333374023438,
+        "y": 4457.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "c41409e5.b5d3c",
+        "id": "1a02430.b289b3d",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2646.6666870117188,
-        "y": 4478.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2691.2333374023438,
+        "y": 4493.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "edec3f37.241e6"
+                "cd907dba.e4d3c8"
             ]
         ]
     },
     {
-        "id": "edec3f37.241e6",
+        "id": "cd907dba.e4d3c8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2858.6666870117188,
-        "y": 4476.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2903.2333374023438,
+        "y": 4491.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "1919beb6.7cb971"
+                "20ed8870.8c9e9"
             ]
         ]
     },
     {
-        "id": "1919beb6.7cb971",
+        "id": "20ed8870.8c9e9",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3042.6666870117188,
-        "y": 4474.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3087.2333374023438,
+        "y": 4489.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "df4bf19a.978d2"
+                "3940766f.dd75d2"
             ]
         ]
     },
     {
-        "id": "df4bf19a.978d2",
+        "id": "3940766f.dd75d2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3221.6666870117188,
-        "y": 4479.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3266.2333374023438,
+        "y": 4494.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "89ff485c.8db648",
-                "2bf1f71c.a919d"
+                "de8d19cf.e0eb38",
+                "501e7414.822a34"
             ]
         ]
     },
     {
-        "id": "2bf1f71c.a919d",
+        "id": "501e7414.822a34",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 3438.6666870117188,
-        "y": 4410.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3483.2333374023438,
+        "y": 4425.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "89ff485c.8db648",
+        "id": "de8d19cf.e0eb38",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3431.6666870117188,
-        "y": 4496.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3476.2333374023438,
+        "y": 4511.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "5ee5ca48.dc9864",
-                "e1c034fb.99a648",
-                "c5ac5c6f.6f9258"
+                "fabce7f.821b298",
+                "84c19fc0.ef7ad8",
+                "d8007fa7.e96748"
             ]
         ]
     },
     {
-        "id": "e1c034fb.99a648",
+        "id": "84c19fc0.ef7ad8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3645.1576538085938,
-        "y": 4481.473937988281,
-        "z": "ab59e982.86c81",
+        "x": 3689.7243041992188,
+        "y": 4496.040603637695,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "6e271c06.d0d73c"
+                "ab7f4c85.a03338"
             ]
         ]
     },
     {
-        "id": "6e271c06.d0d73c",
+        "id": "ab7f4c85.a03338",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3807.7291870117188,
-        "y": 4480.7596435546875,
-        "z": "ab59e982.86c81",
+        "x": 3852.2958374023438,
+        "y": 4495.326309204102,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "38e2891f.3394ee",
+        "id": "c7bb2a00.8d6e3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3808.6666870117188,
-        "y": 4525.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3853.2333374023438,
+        "y": 4540.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "c5ac5c6f.6f9258",
+        "id": "d8007fa7.e96748",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3640.6666870117188,
-        "y": 4525.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3685.2333374023438,
+        "y": 4540.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "38e2891f.3394ee"
+                "c7bb2a00.8d6e3"
             ]
         ]
     },
     {
-        "id": "5ee5ca48.dc9864",
+        "id": "fabce7f.821b298",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3642.6666870117188,
-        "y": 4585.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3687.2333374023438,
+        "y": 4600.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "e13c4300.ac87f"
+                "44bdcb57.5d1c04"
             ]
         ]
     },
     {
-        "id": "e13c4300.ac87f",
+        "id": "44bdcb57.5d1c04",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3811.6666870117188,
-        "y": 4584.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 3856.2333374023438,
+        "y": 4599.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "3fedffc1.068a9"
+                "ab8a9481.ed1188"
             ]
         ]
     },
     {
-        "id": "9f0cdaa9.449a9",
+        "id": "745b8702.06258",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2435.6666870117188,
-        "y": 4476.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2480.2333374023438,
+        "y": 4491.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "c41409e5.b5d3c",
-                "ef03524f.322ab",
-                "a41cf4f1.35b988"
+                "1a02430.b289b3d",
+                "b7b42ab.e3d1558",
+                "e37b8cbd.aee6b8"
             ]
         ]
     },
     {
-        "id": "3fedffc1.068a9",
+        "id": "ab8a9481.ed1188",
         "type": "switchNode",
         "name": "switch srcTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4010.6666870117188,
-        "y": 4585.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 4055.2333374023438,
+        "y": 4600.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "46797ae5.8f5fdc"
+                "b7cd5564.ed6c"
             ]
         ]
     },
     {
-        "id": "46797ae5.8f5fdc",
+        "id": "b7cd5564.ed6c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4173.666687011719,
-        "y": 4583.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 4218.233337402344,
+        "y": 4598.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "26801daf.757d4a"
+                "ccabadec.a87d08"
             ]
         ]
     },
     {
-        "id": "26801daf.757d4a",
+        "id": "ccabadec.a87d08",
         "type": "switchNode",
         "name": "switch dstTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4354.666687011719,
-        "y": 4583.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 4399.233337402344,
+        "y": 4598.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "4ecd0d28.02b6dc"
+                "61252d2.f400154"
             ]
         ]
     },
     {
-        "id": "4ecd0d28.02b6dc",
+        "id": "61252d2.f400154",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4517.666687011719,
-        "y": 4581.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 4562.233337402344,
+        "y": 4596.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "2b446601.7eb632"
+                "c33d2a30.0a34e8"
             ]
         ]
     },
     {
-        "id": "efbe91c3.9535c8",
+        "id": "73039273.69e874",
         "type": "set",
         "name": "set tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",
         "comments": "",
-        "x": 4874.666687011719,
-        "y": 4588.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 4919.233337402344,
+        "y": 4603.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "2b446601.7eb632",
+        "id": "c33d2a30.0a34e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4656.666687011719,
-        "y": 4580.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 4701.233337402344,
+        "y": 4595.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "efbe91c3.9535c8",
-                "1b35126e.c915be"
+                "73039273.69e874",
+                "9503d547.7a1c98"
             ]
         ]
     },
     {
-        "id": "1b35126e.c915be",
+        "id": "9503d547.7a1c98",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4820.666687011719,
-        "y": 4632.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 4865.233337402344,
+        "y": 4647.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "ef03524f.322ab",
+        "id": "b7b42ab.e3d1558",
         "type": "set",
         "name": "unset tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2656.6666870117188,
-        "y": 4439.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2701.2333374023438,
+        "y": 4454.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "bb2c64f6.a88498",
+        "id": "d737e9cc.f602b8",
         "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": 2745.6666870117188,
-        "y": 4613.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2790.2333374023438,
+        "y": 4628.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "a41cf4f1.35b988",
+        "id": "e37b8cbd.aee6b8",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`($tmp.the-vpn-binding.customer-vpn-id + $gfp)`' />\n\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2715.6666870117188,
-        "y": 4673.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 2760.2333374023438,
+        "y": 4688.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "655b0cf9.434f14",
+        "id": "252a570f.f396c8",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1550.6666870117188,
-        "y": 2841.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1595.2333374023438,
+        "y": 2856.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             []
         ]
     },
     {
-        "id": "390f0f63.f5713",
+        "id": "a19e39b9.f8da1",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1630.6666870117188,
-        "y": 2892.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1675.2333374023438,
+        "y": 2907.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "46e17225.a2db0c"
+                "f653960c.909178"
             ]
         ]
     },
     {
-        "id": "46e17225.a2db0c",
+        "id": "f653960c.909178",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 1844.6666870117188,
-        "y": 2891.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1889.2333374023438,
+        "y": 2906.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "2286c595.dee83a",
+        "id": "8f4a3300.fba8d8",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value='' />\n<parameter name='prop.vpn-binding-otnidx-uuid' value='' />\n<parameter name='tmp.access-provider-id' value='' />\n<parameter name='tmp.access-client-id' value='' />\n<parameter name='tmp.access-topology-id' value='' />\n<parameter name='tmp.srcdstpnf-id' value='' />\n<parameter name='tmp.aai.srcdst-pnf.' value='' />\n<parameter name='tmp.domainG.esr-thirdparty-id' value='' />\n<parameter name='tmp.aai.domainG.esr-thirdparty-sdnc.' value='' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value='' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value='' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value='' />\n<parameter name='tmp.srcTtpdstTtpPair' value='' />\n\n\n",
         "comments": "",
-        "x": 1210.5665893554688,
-        "y": 2476.89990234375,
-        "z": "ab59e982.86c81",
+        "x": 1255.1332397460938,
+        "y": 2491.466567993164,
+        "z": "ba0dc87e.a3b258",
         "wires": []
     },
     {
-        "id": "62f58207.69b144",
+        "id": "929a93b0.fb26e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 985.2000122070312,
-        "y": 2493.13330078125,
-        "z": "ab59e982.86c81",
+        "x": 1029.7666625976562,
+        "y": 2507.699966430664,
+        "z": "ba0dc87e.a3b258",
         "wires": [
             [
-                "2286c595.dee83a",
-                "4da32200.1a505"
+                "8f4a3300.fba8d8",
+                "1365d05a.43ccb8"
             ]
         ]
     }
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
index 3fb30cdb..8897cd2b 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
@@ -1,190 +1,190 @@
 [
     {
-        "id": "4bf68406.ddcfc4",
+        "id": "e4aeb52e.202cc8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 252.33331298828125,
-        "y": 102.33334350585938,
-        "z": "f5fa16f3.117ab8",
+        "x": 204.56666564941406,
+        "y": 120,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             [
-                "556d56b1.8aa24"
+                "9feb921c.82a788"
             ]
         ]
     },
     {
-        "id": "556d56b1.8aa24",
+        "id": "9feb921c.82a788",
         "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "name": "GENERIC-RESOURCE-API 777",
         "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
+        "version": "777",
         "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}'>",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='777'>",
         "outputs": 1,
-        "x": 536.6190032958984,
-        "y": 163.5714521408081,
-        "z": "f5fa16f3.117ab8",
+        "x": 488.85235595703125,
+        "y": 181.23810863494873,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             [
-                "5ee8264.6655ed8"
+                "6348e040.131e2"
             ]
         ]
     },
     {
-        "id": "5ee8264.6655ed8",
+        "id": "6348e040.131e2",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-callbackdg-notification",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 523.7619018554688,
-        "y": 239.3333740234375,
-        "z": "f5fa16f3.117ab8",
+        "x": 475.99525451660156,
+        "y": 257.0000305175781,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             [
-                "662af79a.da0ee8"
+                "afa43904.62cb1"
             ]
         ]
     },
     {
-        "id": "662af79a.da0ee8",
+        "id": "afa43904.62cb1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 852.5713500976562,
-        "y": 240.00003051757812,
-        "z": "f5fa16f3.117ab8",
+        "x": 804.8047027587891,
+        "y": 257.66668701171875,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             [
-                "49cf2266.9e9664",
-                "6d86a3cf.e795b4",
-                "747b5a7a.94fc0c",
-                "82c91d0d.6b833",
-                "d8e4f1a3.d839d",
-                "32379d64.d2f70a",
-                "2e37faa.5c2ae06",
-                "83f79f41.a9ad3"
+                "b180367c.1f9198",
+                "7ef57ba6.1f727c",
+                "c42a69a0.a4eb7",
+                "5786b926.3906a8",
+                "b1e4d5b8.551e78",
+                "38d39329.9d1d2c",
+                "25fc0d1d.85e28a",
+                "93ceb81d.d133c"
             ]
         ]
     },
     {
-        "id": "49cf2266.9e9664",
+        "id": "b180367c.1f9198",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1103.3333129882812,
-        "y": 240.33334350585938,
-        "z": "f5fa16f3.117ab8",
+        "x": 1055.566665649414,
+        "y": 258,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6d86a3cf.e795b4",
+        "id": "7ef57ba6.1f727c",
         "type": "set",
         "name": "set received notification parameters",
         "xml": "<set>\n<!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->\n<parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />\n<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />\n<parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />\n<parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />",
         "comments": "",
-        "x": 1131.3333740234375,
-        "y": 413.3333435058594,
-        "z": "f5fa16f3.117ab8",
+        "x": 1083.5667266845703,
+        "y": 431,
+        "z": "bdffb6ef.b80cc8",
         "wires": []
     },
     {
-        "id": "83f79f41.a9ad3",
+        "id": "93ceb81d.d133c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"CallBack DG For SSE CONNECTION is called\"/>\n<!--<parameter name=\"field2\" value=\"`$rcvdNotif`\"/>-->",
         "comments": "",
         "outputs": 1,
-        "x": 1067.3333740234375,
-        "y": 184.33334350585938,
-        "z": "f5fa16f3.117ab8",
+        "x": 1019.5667266845703,
+        "y": 202,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             []
         ]
     },
     {
-        "id": "747b5a7a.94fc0c",
+        "id": "c42a69a0.a4eb7",
         "type": "save",
         "name": "save:metadata to AAI",
-        "xml": "<!--<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"-->\n<!-- key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  -->\n<!--\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->\n<!--\t  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->\n<!--\t  AND service-instance.service-instance-id =  $rcvd-service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />\n",
+        "xml": "<!--<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"-->\n<!-- key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  -->\n<!--\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->\n<!--\t  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->\n<!--\t  AND service-instance.service-instance-id =  $rcvd-service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">-->\n\n<!--<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"-->\n<!-- key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />-->\n<!--    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />-->\n\n\n<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = '5GCustomer' \n AND service-subscription.service-type = '5G'\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />\n\n\n         \n         ",
         "comments": "",
         "outputs": 1,
-        "x": 1088.3333740234375,
-        "y": 476.3333435058594,
-        "z": "f5fa16f3.117ab8",
+        "x": 1040.5667266845703,
+        "y": 494,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             []
         ]
     },
     {
-        "id": "32379d64.d2f70a",
+        "id": "38d39329.9d1d2c",
         "type": "set",
         "name": "set parameters",
         "xml": "<set>\n<parameter name='eventIdUuid' value=\"`'BandwidthChanged_' + $eventId-uuid`\" />\n<parameter name='eventNameUuid' value='`$eventName-uuid`' />\n<parameter name='cclId' value='`$rcvd-service-instance-id`' />\n<parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />\n<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />\n",
         "comments": "",
-        "x": 1067.3333740234375,
-        "y": 723.3333129882812,
-        "z": "f5fa16f3.117ab8",
+        "x": 1019.5667266845703,
+        "y": 740.9999694824219,
+        "z": "bdffb6ef.b80cc8",
         "wires": []
     },
     {
-        "id": "2e37faa.5c2ae06",
+        "id": "25fc0d1d.85e28a",
         "type": "execute",
         "name": "execute RestApiCallNode call VES",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.dcaeAddrAndPort + '/eventListener/v7'`\" />\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />-->\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"ves-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.dcaeAddrAndPort + '/eventListener/v7'`\" />-->\n<parameter name=\"restapiUrl\" value=\"https://dcae-ves-collector:8443/eventListener/v7\" />\n<parameter name=\"restapiUser\" value=\"sample1\" />\n<parameter name=\"restapiPassword\" value=\"sample1\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"ves-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n<parameter name=\"disableHostVerification\" value=\"true\"/>\n<parameter name=\"ssl\" value=\"false\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1125.3333740234375,
-        "y": 766.3333129882812,
-        "z": "f5fa16f3.117ab8",
+        "x": 1077.5667266845703,
+        "y": 783.9999694824219,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             []
         ]
     },
     {
-        "id": "82c91d0d.6b833",
+        "id": "5786b926.3906a8",
         "type": "execute",
         "name": "execute UUID generator for eventId",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1129.3333740234375,
-        "y": 631.3333129882812,
-        "z": "f5fa16f3.117ab8",
+        "x": 1081.5667266845703,
+        "y": 648.9999694824219,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d8e4f1a3.d839d",
+        "id": "b1e4d5b8.551e78",
         "type": "execute",
         "name": "execute UUID generator for eventName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1142.3333740234375,
-        "y": 673.3333129882812,
-        "z": "f5fa16f3.117ab8",
+        "x": 1094.5667266845703,
+        "y": 690.9999694824219,
+        "z": "bdffb6ef.b80cc8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1081f1a.6938",
+        "id": "2ee5d5bb.37a0e2",
         "type": "comment",
         "name": "Calling VES and passing notification parameters",
         "info": "",
         "comments": "",
-        "x": 1156.3333740234375,
-        "y": 576.3333129882812,
-        "z": "f5fa16f3.117ab8",
+        "x": 1108.5667266845703,
+        "y": 593.9999694824219,
+        "z": "bdffb6ef.b80cc8",
         "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 338c6456..2fc491a7 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": "eebfe6b4.36c4f8",
+    "id": "934a37b5.570538",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 140,
-    "y": 119,
-    "z": "f8944603.71553",
+    "x": 132.56666564941406,
+    "y": 130,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f39097a1.daa63"
+        "56cf7e3f.c20408"
       ]
     ]
   },
   {
-    "id": "f39097a1.daa63",
+    "id": "56cf7e3f.c20408",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7886 +22,7886 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 424.2856903076172,
-    "y": 180.23810863494873,
-    "z": "f8944603.71553",
+    "x": 416.85235595703125,
+    "y": 191.23810863494873,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "af444c12.6df4"
+        "9d6f7a83.dd2e58"
       ]
     ]
   },
   {
-    "id": "af444c12.6df4",
+    "id": "9d6f7a83.dd2e58",
     "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": 430.42860412597656,
-    "y": 265.0000305175781,
-    "z": "f8944603.71553",
+    "x": 422.9952697753906,
+    "y": 276.0000305175781,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cd7fb41b.b80af8"
+        "69ada9d9.f9e3c"
       ]
     ]
   },
   {
-    "id": "cd7fb41b.b80af8",
+    "id": "69ada9d9.f9e3c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 780,
-    "y": 324,
-    "z": "f8944603.71553",
+    "x": 772.5666656494141,
+    "y": 335,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1330d7b6.40f6",
-        "327e5a08.352bde",
-        "b36ceae.9917d98"
+        "8dd82f3b.b9fa5",
+        "304cbf07.b12f58",
+        "1a3f65b2.521b1a"
       ]
     ]
   },
   {
-    "id": "1330d7b6.40f6",
+    "id": "8dd82f3b.b9fa5",
     "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": 1081.33349609375,
-    "y": 594.9302978515625,
-    "z": "f8944603.71553",
+    "x": 1073.900161743164,
+    "y": 605.9302978515625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "327e5a08.352bde",
+    "id": "304cbf07.b12f58",
     "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": 1102.761962890625,
-    "y": 297.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1095.328628540039,
+    "y": 308.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "393ddb72.9cdaac",
-        "27423ab.7bf7dc6",
-        "e70357b.8e78fa8"
+        "c42506f9.b054",
+        "15d85509.bac5fb",
+        "c693218f.780828"
       ]
     ]
   },
   {
-    "id": "393ddb72.9cdaac",
+    "id": "c42506f9.b054",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1327.761962890625,
-    "y": 155.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1320.328628540039,
+    "y": 166.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "db827fdb.ec8a7"
+        "c432fa86.b14b18"
       ]
     ]
   },
   {
-    "id": "27423ab.7bf7dc6",
+    "id": "15d85509.bac5fb",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1323.2529296875,
-    "y": 224.9073486328125,
-    "z": "f8944603.71553",
+    "x": 1315.819595336914,
+    "y": 235.9073486328125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2aba6522.745fa2"
+        "c16eebd5.51383"
       ]
     ]
   },
   {
-    "id": "e70357b.8e78fa8",
+    "id": "c693218f.780828",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1311.761962890625,
-    "y": 271.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1304.328628540039,
+    "y": 282.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "85c2ab27.5d7c"
+        "3a0cbeb0.e80882"
       ]
     ]
   },
   {
-    "id": "d67dd652.2acc48",
+    "id": "2b8d35c8.ebc05a",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1081.761962890625,
-    "y": 185.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1074.328628540039,
+    "y": 196.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b36ceae.9917d98",
+    "id": "1a3f65b2.521b1a",
     "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": 1069.761962890625,
-    "y": 237.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1062.328628540039,
+    "y": 248.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "db827fdb.ec8a7",
+    "id": "c432fa86.b14b18",
     "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": 1568,
-    "y": 152,
-    "z": "f8944603.71553",
+    "x": 1560.566665649414,
+    "y": 163,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cb5b5e94.b15ef8",
-        "b997ad22.d70e8"
+        "1d921b54.6d01cd",
+        "4b7292d8.462d44"
       ]
     ]
   },
   {
-    "id": "2aba6522.745fa2",
+    "id": "c16eebd5.51383",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 1478.0623779296875,
-    "y": 227.85977172851562,
-    "z": "f8944603.71553",
+    "x": 1470.6290435791016,
+    "y": 238.85977172851562,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "85c2ab27.5d7c",
+    "id": "3a0cbeb0.e80882",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1482,
-    "y": 272,
-    "z": "f8944603.71553",
+    "x": 1474.566665649414,
+    "y": 283,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cb5b5e94.b15ef8",
+    "id": "1d921b54.6d01cd",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773,
-    "y": 189,
-    "z": "f8944603.71553",
+    "x": 1765.566665649414,
+    "y": 200,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3cb72715.02a808"
+        "e73b29c9.cbd5e8"
       ]
     ]
   },
   {
-    "id": "b997ad22.d70e8",
+    "id": "4b7292d8.462d44",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783,
-    "y": 116,
-    "z": "f8944603.71553",
+    "x": 1775.566665649414,
+    "y": 127,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "3cb72715.02a808",
+    "id": "e73b29c9.cbd5e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1766,
-    "y": 264,
-    "z": "f8944603.71553",
+    "x": 1758.566665649414,
+    "y": 275,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ebf5f2d6.b4c7b8",
-        "490f1cae.a20b64",
-        "b4dd975f.8385a8",
-        "43a803a5.2842f4",
-        "651a17c0.63b678"
+        "d6fcbbd7.6468b8",
+        "8f5c7a9a.326598",
+        "cd48af2d.929d6",
+        "528e88db.403fc",
+        "899de386.880988"
       ]
     ]
   },
   {
-    "id": "d707b8ba.d22b28",
+    "id": "1f336392.1dac3c",
     "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": 2252,
-    "y": 315,
-    "z": "f8944603.71553",
+    "x": 2244.566665649414,
+    "y": 326,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3717142f.9eacbc",
-        "81f224b1.8ce278",
-        "360e18d9.8e8878"
+        "923c23f1.638a98",
+        "ba451af8.67c9c8",
+        "2ed7be49.0a7032"
       ]
     ]
   },
   {
-    "id": "3717142f.9eacbc",
+    "id": "923c23f1.638a98",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2468,
-    "y": 382,
-    "z": "f8944603.71553",
+    "x": 2460.566665649414,
+    "y": 393,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "90fe9f39.2d3b48"
+        "c090e3a4.ec2058"
       ]
     ]
   },
   {
-    "id": "81f224b1.8ce278",
+    "id": "ba451af8.67c9c8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2468.490966796875,
-    "y": 281.573974609375,
-    "z": "f8944603.71553",
+    "x": 2461.057632446289,
+    "y": 292.573974609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fa7677d5.848dd"
+        "4c29ba0c.292a6c"
       ]
     ]
   },
   {
-    "id": "360e18d9.8e8878",
+    "id": "2ed7be49.0a7032",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2464,
-    "y": 331,
-    "z": "f8944603.71553",
+    "x": 2456.566665649414,
+    "y": 342,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "72c2923b.56a34c"
+        "f2cd659.3fc4898"
       ]
     ]
   },
   {
-    "id": "ebf5f2d6.b4c7b8",
+    "id": "d6fcbbd7.6468b8",
     "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": 1969,
-    "y": 296,
-    "z": "f8944603.71553",
+    "x": 1961.566665649414,
+    "y": 307,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "618e3f4f.a42bf",
-        "d707b8ba.d22b28",
-        "e8527008.db6228",
-        "a669b945.663408"
+        "419d8708.3b9078",
+        "1f336392.1dac3c",
+        "90827cac.7f3cc8",
+        "e557ce2.09f823"
       ]
     ]
   },
   {
-    "id": "618e3f4f.a42bf",
+    "id": "419d8708.3b9078",
     "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": 2249,
-    "y": 234,
-    "z": "f8944603.71553",
+    "x": 2241.566665649414,
+    "y": 245,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "43a803a5.2842f4",
+    "id": "528e88db.403fc",
     "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": 1943,
-    "y": 246,
-    "z": "f8944603.71553",
+    "x": 1935.566665649414,
+    "y": 257,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "490f1cae.a20b64",
+    "id": "8f5c7a9a.326598",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1986,
-    "y": 105,
-    "z": "f8944603.71553",
+    "x": 1978.566665649414,
+    "y": 116,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4dd975f.8385a8",
+    "id": "cd48af2d.929d6",
     "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\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1998,
-    "y": 146,
-    "z": "f8944603.71553",
+    "x": 1990.566665649414,
+    "y": 157,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "d38afd8a.8bc96",
+    "id": "73efca11.a03e0c",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2023,
-    "y": 58,
-    "z": "f8944603.71553",
+    "x": 2015.566665649414,
+    "y": 69,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "8fedb211.a1c3d8",
+    "id": "19fb453a.d497cb",
     "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": 1943,
-    "y": 192,
-    "z": "f8944603.71553",
+    "x": 1935.566665649414,
+    "y": 203,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fa7677d5.848dd",
+    "id": "4c29ba0c.292a6c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 2647,
-    "y": 284,
-    "z": "f8944603.71553",
+    "x": 2639.566665649414,
+    "y": 295,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "72c2923b.56a34c",
+    "id": "f2cd659.3fc4898",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2646.9375,
-    "y": 333.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2639.504165649414,
+    "y": 344.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "90fe9f39.2d3b48",
+    "id": "c090e3a4.ec2058",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2648.9375,
-    "y": 384.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2641.504165649414,
+    "y": 395.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "458d5965.a3abf"
+        "383f413.f1d10be"
       ]
     ]
   },
   {
-    "id": "458d5965.a3abf",
+    "id": "383f413.f1d10be",
     "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": 2941.9375,
-    "y": 331.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2934.504165649414,
+    "y": 342.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9e8135ff.08a04",
-        "11480c56.53825c",
-        "c18b528b.950eb"
+        "7f2204ba.ff0eac",
+        "6593ad3c.c3a94c",
+        "91d5dd73.0552a8"
       ]
     ]
   },
   {
-    "id": "11480c56.53825c",
+    "id": "6593ad3c.c3a94c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3245.428436279297,
-    "y": 63.7142333984375,
-    "z": "f8944603.71553",
+    "x": 3237.995101928711,
+    "y": 74.7142333984375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fafa91c8.b89"
+        "578e5a01.301d74"
       ]
     ]
   },
   {
-    "id": "fafa91c8.b89",
+    "id": "578e5a01.301d74",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3422.999969482422,
-    "y": 64,
-    "z": "f8944603.71553",
+    "x": 3415.566635131836,
+    "y": 75,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c18b528b.950eb",
+    "id": "91d5dd73.0552a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3240.937469482422,
-    "y": 113.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3233.504135131836,
+    "y": 124.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c9c4d95e.e78bc8"
+        "3a340bd0.83bde4"
       ]
     ]
   },
   {
-    "id": "c9c4d95e.e78bc8",
+    "id": "3a340bd0.83bde4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3422.937469482422,
-    "y": 113.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3415.504135131836,
+    "y": 124.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9e8135ff.08a04",
+    "id": "7f2204ba.ff0eac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3244.937469482422,
-    "y": 164.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3237.504135131836,
+    "y": 175.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "249c683e.fa6548"
+        "5f6b46f2.1bbc28"
       ]
     ]
   },
   {
-    "id": "249c683e.fa6548",
+    "id": "5f6b46f2.1bbc28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3424.937469482422,
-    "y": 164.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3417.504135131836,
+    "y": 175.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8380148b.ccdda"
+        "432203ff.80791c"
       ]
     ]
   },
   {
-    "id": "8380148b.ccdda",
+    "id": "432203ff.80791c",
     "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": 2961,
-    "y": 459,
-    "z": "f8944603.71553",
+    "x": 2953.566665649414,
+    "y": 470,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f9f860ee.48ada",
-        "3ee71a32.7e39ae"
+        "25bf5884.d1bc1",
+        "68d7ca3f.b9c4a4"
       ]
     ]
   },
   {
-    "id": "3ee71a32.7e39ae",
+    "id": "68d7ca3f.b9c4a4",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3300.999969482422,
-    "y": 306,
-    "z": "f8944603.71553",
+    "x": 3293.566635131836,
+    "y": 317,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f9f860ee.48ada",
+    "id": "25bf5884.d1bc1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3299.999969482422,
-    "y": 360,
-    "z": "f8944603.71553",
+    "x": 3292.566635131836,
+    "y": 371,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "88c3b86.63e2c48"
+        "a4256717.8bdab"
       ]
     ]
   },
   {
-    "id": "b0fb22ca.f9ce1",
+    "id": "dc3dd60e.e6fb58",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4044.999969482422,
-    "y": 314,
-    "z": "f8944603.71553",
+    "x": 4037.566635131836,
+    "y": 325,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5f3f920d.e5225c"
+        "7a99d9c1.cc807"
       ]
     ]
   },
   {
-    "id": "5f3f920d.e5225c",
+    "id": "7a99d9c1.cc807",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4221.999847412109,
-    "y": 306.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4214.566513061523,
+    "y": 317.9998779296875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8197a230.f5fc28",
-        "add943b3.661de"
+        "54329230.9376a4",
+        "e44ffd73.3caae8"
       ]
     ]
   },
   {
-    "id": "88c3b86.63e2c48",
+    "id": "a4256717.8bdab",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3463.999969482422,
-    "y": 286,
-    "z": "f8944603.71553",
+    "x": 3456.566635131836,
+    "y": 297,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b1327250.c3733",
-        "de9a0d51.d824a"
+        "ab8d2f4.fb7de5",
+        "6cd92abd.ea602c"
       ]
     ]
   },
   {
-    "id": "b1327250.c3733",
+    "id": "ab8d2f4.fb7de5",
     "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": 3744.999969482422,
-    "y": 242,
-    "z": "f8944603.71553",
+    "x": 3737.566635131836,
+    "y": 253,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "64d386dc.4f4038"
+        "d2f6d2c1.0cd0b8"
       ]
     ]
   },
   {
-    "id": "64d386dc.4f4038",
+    "id": "d2f6d2c1.0cd0b8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4006.999969482422,
-    "y": 242,
-    "z": "f8944603.71553",
+    "x": 3999.566635131836,
+    "y": 253,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b0fb22ca.f9ce1"
+        "dc3dd60e.e6fb58"
       ]
     ]
   },
   {
-    "id": "8197a230.f5fc28",
+    "id": "54329230.9376a4",
     "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": 4464.999847412109,
-    "y": 263.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4457.566513061523,
+    "y": 274.9998779296875,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "add943b3.661de",
+    "id": "e44ffd73.3caae8",
     "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": 4453.999847412109,
-    "y": 318.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4446.566513061523,
+    "y": 329.9998779296875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "584012e4.8af54c",
-        "84e11e56.e2a698",
-        "b5114711.48fe28"
+        "9db3143c.c20748",
+        "3f90e90d.8c4416",
+        "767c00f3.c60f18"
       ]
     ]
   },
   {
-    "id": "b5114711.48fe28",
+    "id": "767c00f3.c60f18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4705.000213623047,
-    "y": 260,
-    "z": "f8944603.71553",
+    "x": 4697.566879272461,
+    "y": 271,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3ff18282.41fa7e"
+        "eb2a7a65.4a99c"
       ]
     ]
   },
   {
-    "id": "3ff18282.41fa7e",
+    "id": "eb2a7a65.4a99c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4853.571746826172,
-    "y": 260.2857666015625,
-    "z": "f8944603.71553",
+    "x": 4846.138412475586,
+    "y": 271.2857666015625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "576f251.536f1dc",
+    "id": "1d4fa709.d3c2b1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4852.509246826172,
-    "y": 304.426025390625,
-    "z": "f8944603.71553",
+    "x": 4845.075912475586,
+    "y": 315.426025390625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "84e11e56.e2a698",
+    "id": "3f90e90d.8c4416",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4693.509246826172,
-    "y": 304.426025390625,
-    "z": "f8944603.71553",
+    "x": 4686.075912475586,
+    "y": 315.426025390625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "576f251.536f1dc"
+        "1d4fa709.d3c2b1"
       ]
     ]
   },
   {
-    "id": "584012e4.8af54c",
+    "id": "9db3143c.c20748",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4700.509246826172,
-    "y": 383.426025390625,
-    "z": "f8944603.71553",
+    "x": 4693.075912475586,
+    "y": 394.426025390625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "84e0295.fec0058"
+        "d725abd1.c0b928"
       ]
     ]
   },
   {
-    "id": "84e0295.fec0058",
+    "id": "d725abd1.c0b928",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4839.509246826172,
-    "y": 383.426025390625,
-    "z": "f8944603.71553",
+    "x": 4832.075912475586,
+    "y": 394.426025390625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "40dc732c.a37574",
-        "72f9e36c.5c6004"
+        "561b0f6d.fce1f8",
+        "8702a1ee.cea5e8"
       ]
     ]
   },
   {
-    "id": "40dc732c.a37574",
+    "id": "561b0f6d.fce1f8",
     "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": 5045.000213623047,
-    "y": 381,
-    "z": "f8944603.71553",
+    "x": 5037.566879272461,
+    "y": 392,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "72f9e36c.5c6004",
+    "id": "8702a1ee.cea5e8",
     "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": 5044.000213623047,
-    "y": 427,
-    "z": "f8944603.71553",
+    "x": 5036.566879272461,
+    "y": 438,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "de9a0d51.d824a",
+    "id": "6cd92abd.ea602c",
     "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": 3561.999969482422,
-    "y": 358,
-    "z": "f8944603.71553",
+    "x": 3554.566635131836,
+    "y": 369,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1f9cf648.b23842"
+        "dd91e386.997658"
       ]
     ]
   },
   {
-    "id": "1f9cf648.b23842",
+    "id": "dd91e386.997658",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3841.999969482422,
-    "y": 358,
-    "z": "f8944603.71553",
+    "x": 3834.566635131836,
+    "y": 369,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9a7f86a9.e4bc3"
+        "d0b5ecff.91d928"
       ]
     ]
   },
   {
-    "id": "9a7f86a9.e4bc3",
+    "id": "d0b5ecff.91d928",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2225.0001220703125,
-    "y": 771.0001220703125,
-    "z": "f8944603.71553",
+    "x": 2217.5667877197266,
+    "y": 782.0001220703125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a00c69ca.adce48"
+        "3175715f.1727f6"
       ]
     ]
   },
   {
-    "id": "a00c69ca.adce48",
+    "id": "3175715f.1727f6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2402,
-    "y": 764,
-    "z": "f8944603.71553",
+    "x": 2394.566665649414,
+    "y": 775,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b1915aed.463e4",
-        "2d618162.692d86"
+        "e36efc83.994d78",
+        "41c74306.d5cc9c"
       ]
     ]
   },
   {
-    "id": "b1915aed.463e4",
+    "id": "e36efc83.994d78",
     "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": 2645,
-    "y": 721,
-    "z": "f8944603.71553",
+    "x": 2637.566665649414,
+    "y": 732,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "2d618162.692d86",
+    "id": "41c74306.d5cc9c",
     "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": 2634,
-    "y": 776,
-    "z": "f8944603.71553",
+    "x": 2626.566665649414,
+    "y": 787,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e482931e.42ecd",
-        "ed5f6487.2f87b",
-        "f8d33751.7b5a4"
+        "9d68f10f.bd8b8",
+        "dffb55fa.85b55",
+        "c53e6e84.05ac9"
       ]
     ]
   },
   {
-    "id": "e482931e.42ecd",
+    "id": "9d68f10f.bd8b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2925.490966796875,
-    "y": 754.573974609375,
-    "z": "f8944603.71553",
+    "x": 2918.057632446289,
+    "y": 765.573974609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "57635b4b.26640c"
+        "b9d2eb35.931cc8"
       ]
     ]
   },
   {
-    "id": "ed5f6487.2f87b",
+    "id": "dffb55fa.85b55",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2914,
-    "y": 799,
-    "z": "f8944603.71553",
+    "x": 2906.566665649414,
+    "y": 810,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a7b92e8f.8c52e8"
+        "e6924452.e6205"
       ]
     ]
   },
   {
-    "id": "57635b4b.26640c",
+    "id": "b9d2eb35.931cc8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3074.0625,
-    "y": 754.8597412109375,
-    "z": "f8944603.71553",
+    "x": 3066.629165649414,
+    "y": 765.8597412109375,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a7b92e8f.8c52e8",
+    "id": "e6924452.e6205",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3073,
-    "y": 799,
-    "z": "f8944603.71553",
+    "x": 3065.566665649414,
+    "y": 810,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f8d33751.7b5a4",
+    "id": "c53e6e84.05ac9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2921,
-    "y": 878,
-    "z": "f8944603.71553",
+    "x": 2913.566665649414,
+    "y": 889,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "98a40400.3efa78"
+        "361f88a3.058c08"
       ]
     ]
   },
   {
-    "id": "98a40400.3efa78",
+    "id": "361f88a3.058c08",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3060,
-    "y": 878,
-    "z": "f8944603.71553",
+    "x": 3052.566665649414,
+    "y": 889,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "71736994.8ef448",
-        "262a2cdd.1722ec",
-        "6dffa8a4.87ef28",
-        "19dc8ab.73ff975",
-        "442ee5c4.7ebc14",
-        "55e39af5.a2b61c",
-        "22efa8c9.c8576",
-        "d6e1611b.9ddcf",
-        "b18620c8.640928",
-        "11e0f934.faeab7",
-        "b71f57a7.e2a288",
-        "f7d11626.bd108",
-        "7d22810d.66642",
-        "5fc2699f.6720b8",
-        "d4db1de6.243c9",
-        "4c9f1a43.e137e4",
-        "f953800.9cf34",
-        "1931dff5.72d728",
-        "be1fed24.75522",
-        "3ab03c8.bdf8544",
-        "d566dc7.835f6a"
+        "936c7f50.057838",
+        "fff97b6b.1650f8",
+        "40c59221.de8304",
+        "da2087d.3780d78",
+        "db5a893f.6acb2",
+        "855375ef.856b78",
+        "bd585daa.5b0d3",
+        "d3754757.4f2538",
+        "dd28e890.6f37f",
+        "10147ab3.fed6fd",
+        "425867c4.b0a9",
+        "e3e1a44c.9927b8",
+        "4a62d4e.fca9aac",
+        "2ae40328.466974",
+        "f71bee39.3d2f68",
+        "6cb3b80a.d81b1",
+        "7411f30.15b1c8c",
+        "59ced5c4.1cbb54",
+        "b2338e3d.f752e8",
+        "8b07e19d.5f94",
+        "877b276.88c73d8"
       ]
     ]
   },
   {
-    "id": "8992052.d396a78",
+    "id": "b5bad4b9.685ad8",
     "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": 3409,
-    "y": 411.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3401.566665649414,
+    "y": 422.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "71736994.8ef448",
+    "id": "936c7f50.057838",
     "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": 3389.9999389648438,
-    "y": 490.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3382.566604614258,
+    "y": 501.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "5fc2699f.6720b8",
+    "id": "2ae40328.466974",
     "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": 3346.9999389648438,
-    "y": 535.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3339.566604614258,
+    "y": 546.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "262a2cdd.1722ec",
+    "id": "fff97b6b.1650f8",
     "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": 3311.999969482422,
-    "y": 589.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3304.566635131836,
+    "y": 600.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6dffa8a4.87ef28",
+    "id": "40c59221.de8304",
     "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": 3312.999969482422,
-    "y": 644.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3305.566635131836,
+    "y": 655.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "19dc8ab.73ff975",
+    "id": "da2087d.3780d78",
     "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": 3310.999969482422,
-    "y": 908.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3303.566635131836,
+    "y": 919.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6a238476.e2fb94",
-        "535decdf.f72024",
-        "ae1cf5c7.80a6f8"
+        "969278b.6dcd308",
+        "8ef50320.33a2f",
+        "bc9f501b.616458"
       ]
     ]
   },
   {
-    "id": "442ee5c4.7ebc14",
+    "id": "db5a893f.6acb2",
     "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": 3305.999969482422,
-    "y": 969.9998474121094,
-    "z": "f8944603.71553",
+    "x": 3298.566635131836,
+    "y": 980.9998474121094,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3acf80af.f43f8",
-        "d256cf0d.9aea78",
-        "e101efde.aba"
+        "3f6dc76b.2c189",
+        "8fe533b.8ccffd",
+        "17823dcb.715f8a"
       ]
     ]
   },
   {
-    "id": "6a238476.e2fb94",
+    "id": "969278b.6dcd308",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3621.999969482422,
-    "y": 679.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3614.566635131836,
+    "y": 690.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ab9f09fe.f29c98"
+        "9ca5fa1b.024df8"
       ]
     ]
   },
   {
-    "id": "535decdf.f72024",
+    "id": "8ef50320.33a2f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617.509002685547,
-    "y": 729.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3610.075668334961,
+    "y": 740.4259948730469,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e4e6f924.884bf"
+        "e39d355.b4f33c8"
       ]
     ]
   },
   {
-    "id": "ae1cf5c7.80a6f8",
+    "id": "bc9f501b.616458",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3621.509002685547,
-    "y": 782.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3614.075668334961,
+    "y": 793.4259948730469,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ab5ff9c2.10c8a"
+        "e84899ba.db50e8"
       ]
     ]
   },
   {
-    "id": "ab9f09fe.f29c98",
+    "id": "9ca5fa1b.024df8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3770.571502685547,
-    "y": 679.2857360839844,
-    "z": "f8944603.71553",
+    "x": 3763.138168334961,
+    "y": 690.2857360839844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "e4e6f924.884bf",
+    "id": "e39d355.b4f33c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3760.509002685547,
-    "y": 729.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3753.075668334961,
+    "y": 740.4259948730469,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3acf80af.f43f8",
+    "id": "3f6dc76b.2c189",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3583.9999389648438,
-    "y": 869.9998168945312,
-    "z": "f8944603.71553",
+    "x": 3576.566604614258,
+    "y": 880.9998168945312,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "87a2e14c.f364a"
+        "62e0b7bc.37a4e"
       ]
     ]
   },
   {
-    "id": "d256cf0d.9aea78",
+    "id": "8fe533b.8ccffd",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3579.509002685547,
-    "y": 912.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3572.075668334961,
+    "y": 923.4258728027344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "98a18e9a.d4f5a"
+        "ac864505.12601"
       ]
     ]
   },
   {
-    "id": "e101efde.aba",
+    "id": "17823dcb.715f8a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.509002685547,
-    "y": 965.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3573.075668334961,
+    "y": 976.4258728027344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4d45fe17.38da58"
+        "bed44813.048dd"
       ]
     ]
   },
   {
-    "id": "87a2e14c.f364a",
+    "id": "62e0b7bc.37a4e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3732.5714721679688,
-    "y": 869.2855834960938,
-    "z": "f8944603.71553",
+    "x": 3725.138137817383,
+    "y": 880.2855834960938,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "98a18e9a.d4f5a",
+    "id": "ac864505.12601",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3722.509002685547,
-    "y": 912.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3715.075668334961,
+    "y": 923.4258728027344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "ab5ff9c2.10c8a",
+    "id": "e84899ba.db50e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3782.999969482422,
-    "y": 781.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3775.566635131836,
+    "y": 792.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "84478c6a.6d587"
+        "f9db2337.8fb9d"
       ]
     ]
   },
   {
-    "id": "4d45fe17.38da58",
+    "id": "bed44813.048dd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3733.999969482422,
-    "y": 964.9998474121094,
-    "z": "f8944603.71553",
+    "x": 3726.566635131836,
+    "y": 975.9998474121094,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2dfc998d.a2b3e6"
+        "423a02cf.14e434"
       ]
     ]
   },
   {
-    "id": "84478c6a.6d587",
+    "id": "f9db2337.8fb9d",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3957.999969482422,
-    "y": 755.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3950.566635131836,
+    "y": 766.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "be084505.b458",
-        "5b2d2057.dd8c4",
-        "83ce05e.7f315f8"
+        "2c035f93.775ae8",
+        "a1971f98.6ccb48",
+        "dd62b4eb.26fb1"
       ]
     ]
   },
   {
-    "id": "2dfc998d.a2b3e6",
+    "id": "423a02cf.14e434",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3917.999969482422,
-    "y": 872.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3910.566635131836,
+    "y": 883.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "27a94561.e70e32",
-        "e39a6c9c.1e6dd8",
-        "fe4b773c.0eae98"
+        "9f546ca0.9d33e8",
+        "2ec96d4e.1ca132",
+        "cb966d3f.bcf358"
       ]
     ]
   },
   {
-    "id": "be084505.b458",
+    "id": "2c035f93.775ae8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4079.999969482422,
-    "y": 540.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4072.566635131836,
+    "y": 551.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "86b880d.ad45d"
+        "6429cd23.35e7c4"
       ]
     ]
   },
   {
-    "id": "5b2d2057.dd8c4",
+    "id": "a1971f98.6ccb48",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.999969482422,
-    "y": 594.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4074.566635131836,
+    "y": 605.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "10eaea8a.998afd"
+        "17c9fbf5.2a0a34"
       ]
     ]
   },
   {
-    "id": "27a94561.e70e32",
+    "id": "9f546ca0.9d33e8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099,
-    "y": 811,
-    "z": "f8944603.71553",
+    "x": 4091.566665649414,
+    "y": 822,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e84921e.f8ecce"
+        "22d232ad.fa9d6e"
       ]
     ]
   },
   {
-    "id": "e39a6c9c.1e6dd8",
+    "id": "2ec96d4e.1ca132",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4101,
-    "y": 865,
-    "z": "f8944603.71553",
+    "x": 4093.566665649414,
+    "y": 876,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b7ebf9b7.e2f348"
+        "5c001c7.14606e4"
       ]
     ]
   },
   {
-    "id": "4ebe65d0.3ec92c",
+    "id": "d98ccbbe.37e04",
     "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.999969482422,
-    "y": 492.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4382.566635131836,
+    "y": 503.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b5b3e89e.18b28",
+    "id": "449eb720.722948",
     "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.999969482422,
-    "y": 590.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4375.566635131836,
+    "y": 601.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "81270995.5d712",
+    "id": "83bfbc5.ae6994",
     "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": 4401,
-    "y": 784,
-    "z": "f8944603.71553",
+    "x": 4393.566665649414,
+    "y": 795,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7db54dd4.f36624",
+    "id": "5244a859.c728e8",
     "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": 4405,
-    "y": 877,
-    "z": "f8944603.71553",
+    "x": 4397.566665649414,
+    "y": 888,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3464c217.ddf82e",
+    "id": "6ca3f458.2d99d4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3548,
-    "y": 1549,
-    "z": "f8944603.71553",
+    "x": 3540.566665649414,
+    "y": 1560,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5c2f3801.4eed3"
+        "3eea4372.1c5814"
       ]
     ]
   },
   {
-    "id": "e12bcc6e.caae8",
+    "id": "662947db.2b96e8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3557.490966796875,
-    "y": 1591.5740356445312,
-    "z": "f8944603.71553",
+    "x": 3550.057632446289,
+    "y": 1602.5740356445312,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fb3f4046.01bc4"
+        "f28295e0.d2c148"
       ]
     ]
   },
   {
-    "id": "a3a68564.d1334",
+    "id": "5677884d.d93c78",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3546,
-    "y": 1638,
-    "z": "f8944603.71553",
+    "x": 3538.566665649414,
+    "y": 1649,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9f68f9be.d7aab8"
+        "f900f622.22fda"
       ]
     ]
   },
   {
-    "id": "8a9b7f74.e3a568",
+    "id": "eddb7de7.123d5",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3248,
-    "y": 1511,
-    "z": "f8944603.71553",
+    "x": 3240.566665649414,
+    "y": 1522,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "22efa8c9.c8576",
+    "id": "bd585daa.5b0d3",
     "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": 3291,
-    "y": 1576,
-    "z": "f8944603.71553",
+    "x": 3283.566665649414,
+    "y": 1587,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3464c217.ddf82e",
-        "e12bcc6e.caae8",
-        "a3a68564.d1334"
+        "6ca3f458.2d99d4",
+        "662947db.2b96e8",
+        "5677884d.d93c78"
       ]
     ]
   },
   {
-    "id": "55e39af5.a2b61c",
+    "id": "855375ef.856b78",
     "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": 3292,
-    "y": 1246,
-    "z": "f8944603.71553",
+    "x": 3284.566665649414,
+    "y": 1257,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cbe70d53.b79168",
-        "9e0cb899.0e0f"
+        "74d070ad.2d8b38",
+        "f1856675.64f168"
       ]
     ]
   },
   {
-    "id": "9e0cb899.0e0f",
+    "id": "f1856675.64f168",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3512.999969482422,
-    "y": 1298.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3505.566635131836,
+    "y": 1309.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "300fab87.54654c"
+        "77f0bbcf.b75e0c"
       ]
     ]
   },
   {
-    "id": "cbe70d53.b79168",
+    "id": "74d070ad.2d8b38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3514.999969482422,
-    "y": 1331.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3507.566635131836,
+    "y": 1342.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ad0b83ff.4cb308"
+        "6e268d43.53f934"
       ]
     ]
   },
   {
-    "id": "5c2f3801.4eed3",
+    "id": "3eea4372.1c5814",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3720.66650390625,
-    "y": 1548,
-    "z": "f8944603.71553",
+    "x": 3713.233169555664,
+    "y": 1559,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fe2c6692.47101",
-        "9af14a91.b12a68"
+        "f48e6ddf.17618",
+        "cc30c632.26f008"
       ]
     ]
   },
   {
-    "id": "fb3f4046.01bc4",
+    "id": "f28295e0.d2c148",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3711.0623779296875,
-    "y": 1594.8597717285156,
-    "z": "f8944603.71553",
+    "x": 3703.6290435791016,
+    "y": 1605.8597717285156,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9f68f9be.d7aab8",
+    "id": "f900f622.22fda",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3715,
-    "y": 1639,
-    "z": "f8944603.71553",
+    "x": 3707.566665649414,
+    "y": 1650,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fe2c6692.47101",
+    "id": "f48e6ddf.17618",
     "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": 3985,
-    "y": 1532,
-    "z": "f8944603.71553",
+    "x": 3977.566665649414,
+    "y": 1543,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "37956c14.cf1964",
-        "7f26a273.a5f25c"
+        "c31fbd4a.4c152",
+        "ca57bc98.e008f"
       ]
     ]
   },
   {
-    "id": "7f26a273.a5f25c",
+    "id": "ca57bc98.e008f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4208,
-    "y": 1487,
-    "z": "f8944603.71553",
+    "x": 4200.566665649414,
+    "y": 1498,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d180abab.fe69a"
+        "ae27226e.c1211"
       ]
     ]
   },
   {
-    "id": "37956c14.cf1964",
+    "id": "c31fbd4a.4c152",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4210,
-    "y": 1551,
-    "z": "f8944603.71553",
+    "x": 4202.566665649414,
+    "y": 1562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "11875f6b.e538c1"
+        "48b6888c.1688c8"
       ]
     ]
   },
   {
-    "id": "11875f6b.e538c1",
+    "id": "48b6888c.1688c8",
     "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": 4372,
-    "y": 1547,
-    "z": "f8944603.71553",
+    "x": 4364.566665649414,
+    "y": 1558,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d180abab.fe69a",
+    "id": "ae27226e.c1211",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4373,
-    "y": 1484,
-    "z": "f8944603.71553",
+    "x": 4365.566665649414,
+    "y": 1495,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c42ee54d.ec9ea",
-        "e2dee17e.90746"
+        "dc9805ea.b1d968",
+        "e17a88a7.3a0c68"
       ]
     ]
   },
   {
-    "id": "ad0b83ff.4cb308",
+    "id": "6e268d43.53f934",
     "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": 3657.999969482422,
-    "y": 1328.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3650.566635131836,
+    "y": 1339.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "300fab87.54654c",
+    "id": "77f0bbcf.b75e0c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3660.999969482422,
-    "y": 1291.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3653.566635131836,
+    "y": 1302.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "844bb618.6c32e8",
-        "99a55ff.3057da"
+        "6b41cb54.146c7c",
+        "2227088d.da8978"
       ]
     ]
   },
   {
-    "id": "844bb618.6c32e8",
+    "id": "6b41cb54.146c7c",
     "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": 3834.999969482422,
-    "y": 1247.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3827.566635131836,
+    "y": 1258.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9af14a91.b12a68",
+    "id": "cc30c632.26f008",
     "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": 3933.999969482422,
-    "y": 1641.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3926.566635131836,
+    "y": 1652.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1b19176e.822411"
+        "4c51d8d9.7e50e"
       ]
     ]
   },
   {
-    "id": "1b19176e.822411",
+    "id": "4c51d8d9.7e50e",
     "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": 4139.999969482422,
-    "y": 1641.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4132.566635131836,
+    "y": 1652.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c875ac48.6e9"
+        "ea6dd5aa.f54cc"
       ]
     ]
   },
   {
-    "id": "c875ac48.6e9",
+    "id": "ea6dd5aa.f54cc",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4355.285614013672,
-    "y": 1641.8217468261719,
-    "z": "f8944603.71553",
+    "x": 4347.852279663086,
+    "y": 1652.8217468261719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6e0bf03.4de201"
+        "878f0a88.cc7f28"
       ]
     ]
   },
   {
-    "id": "99a55ff.3057da",
+    "id": "2227088d.da8978",
     "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": 3849.999969482422,
-    "y": 1358.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3842.566635131836,
+    "y": 1369.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "26c5a31d.0e26c4",
-        "1dba38b8.e09647",
-        "703777cb.7523f"
+        "a1b22fed.dd46f",
+        "39006ff3.e4d42",
+        "90a88d63.a0deb"
       ]
     ]
   },
   {
-    "id": "26c5a31d.0e26c4",
+    "id": "a1b22fed.dd46f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.5000915527344,
-    "y": 1310.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4038.0667572021484,
+    "y": 1321.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3f157e84.d62172"
+        "11cc8b93.732e94"
       ]
     ]
   },
   {
-    "id": "1dba38b8.e09647",
+    "id": "39006ff3.e4d42",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4037.5000915527344,
-    "y": 1365.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4030.0667572021484,
+    "y": 1376.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7126adde.e76d1c"
+        "dc84c818.c1238"
       ]
     ]
   },
   {
-    "id": "703777cb.7523f",
+    "id": "90a88d63.a0deb",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.5000915527344,
-    "y": 1422.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4035.0667572021484,
+    "y": 1433.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f85ce86b.434b48"
+        "5b4aec5c.78ea6c"
       ]
     ]
   },
   {
-    "id": "f85ce86b.434b48",
+    "id": "5b4aec5c.78ea6c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4194.500091552734,
-    "y": 1423.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4187.066757202148,
+    "y": 1434.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7126adde.e76d1c",
+    "id": "dc84c818.c1238",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4205.500091552734,
-    "y": 1368.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4198.066757202148,
+    "y": 1379.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3f157e84.d62172",
+    "id": "11cc8b93.732e94",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4189.882415771484,
-    "y": 1308.6556396484375,
-    "z": "f8944603.71553",
+    "x": 4182.449081420898,
+    "y": 1319.6556396484375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "61a6617b.c1f918"
+        "3dd6ac8d.e6d824"
       ]
     ]
   },
   {
-    "id": "61a6617b.c1f918",
+    "id": "3dd6ac8d.e6d824",
     "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": 4373.999969482422,
-    "y": 1322.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4366.566635131836,
+    "y": 1333.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c94ffafa.dcbd38"
+        "2c6d0561.1001da"
       ]
     ]
   },
   {
-    "id": "e2dee17e.90746",
+    "id": "e17a88a7.3a0c68",
     "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": 4543,
-    "y": 1442,
-    "z": "f8944603.71553",
+    "x": 4535.566665649414,
+    "y": 1453,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c42ee54d.ec9ea",
+    "id": "dc9805ea.b1d968",
     "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": 4544,
-    "y": 1550,
-    "z": "f8944603.71553",
+    "x": 4536.566665649414,
+    "y": 1561,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a1e5e819.9ba388",
+    "id": "4eccdb3c.a00b8c",
     "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": 4545,
-    "y": 1499,
-    "z": "f8944603.71553",
+    "x": 4537.566665649414,
+    "y": 1510,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6e0bf03.4de201",
+    "id": "878f0a88.cc7f28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4562.117156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4554.683822631836,
+    "y": 1653.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "663b6226.995afc",
-        "dd7e9ff0.ed3a48",
-        "21e8d5ce.795f42"
+        "a6df4a7c.6d4298",
+        "e55c6491.d1cf5",
+        "7eb455b8.997c94"
       ]
     ]
   },
   {
-    "id": "663b6226.995afc",
+    "id": "a6df4a7c.6d4298",
     "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": 4777.117156982422,
-    "y": 1604.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4769.683822631836,
+    "y": 1615.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "dd7e9ff0.ed3a48",
+    "id": "e55c6491.d1cf5",
     "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": 4774.117156982422,
-    "y": 1643.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4766.683822631836,
+    "y": 1654.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "49a01492.84fe34"
+        "5121fcc7.d1555c"
       ]
     ]
   },
   {
-    "id": "21e8d5ce.795f42",
+    "id": "7eb455b8.997c94",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4729.617156982422,
-    "y": 1685.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4722.183822631836,
+    "y": 1696.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "49a01492.84fe34",
+    "id": "5121fcc7.d1555c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4947.183822631836,
+    "y": 1653.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "292cacf5.882694"
+        "dcdffb31.a68748"
       ]
     ]
   },
   {
-    "id": "ccfcf164.268f1",
+    "id": "ee290dd7.3447b8",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4774,
-    "y": 1260,
-    "z": "f8944603.71553",
+    "x": 4766.566665649414,
+    "y": 1271,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c88ef5fa.00d8b"
+        "f5c3f7a5.0472d8"
       ]
     ]
   },
   {
-    "id": "c88ef5fa.00d8b",
+    "id": "f5c3f7a5.0472d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4951,
-    "y": 1252,
-    "z": "f8944603.71553",
+    "x": 4943.566665649414,
+    "y": 1263,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "889b0a64.f04af",
-        "b7b819bd.9ab3a"
+        "92327400.5b0ea",
+        "7dac197a.3be828"
       ]
     ]
   },
   {
-    "id": "c94ffafa.dcbd38",
+    "id": "2c6d0561.1001da",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4568.999969482422,
-    "y": 1322.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4561.566635131836,
+    "y": 1333.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ccfcf164.268f1",
-        "109fb904.331fef"
+        "ee290dd7.3447b8",
+        "97637af.969a388"
       ]
     ]
   },
   {
-    "id": "109fb904.331fef",
+    "id": "97637af.969a388",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4777,
-    "y": 1334,
-    "z": "f8944603.71553",
+    "x": 4769.566665649414,
+    "y": 1345,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c72b69fd.2d015"
+        "2b94ab82.f6af74"
       ]
     ]
   },
   {
-    "id": "c72b69fd.2d015",
+    "id": "2b94ab82.f6af74",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4954,
-    "y": 1326,
-    "z": "f8944603.71553",
+    "x": 4946.566665649414,
+    "y": 1337,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7fcaaf72.ffd618"
+        "a745e5da.a32578"
       ]
     ]
   },
   {
-    "id": "292cacf5.882694",
+    "id": "dcdffb31.a68748",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5112.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 5105.183822631836,
+    "y": 1653.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "63e30873.d5c4b8"
+        "f0d23e06.a32c6"
       ]
     ]
   },
   {
-    "id": "63e30873.d5c4b8",
+    "id": "f0d23e06.a32c6",
     "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": 5319.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 5312.183822631836,
+    "y": 1653.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b7b819bd.9ab3a",
+    "id": "7dac197a.3be828",
     "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": 5159,
-    "y": 1259,
-    "z": "f8944603.71553",
+    "x": 5151.566665649414,
+    "y": 1270,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b062763c.d2a4c",
-        "54b52301.01aeac",
-        "c657b443.273d9"
+        "36ef2efb.214b2a",
+        "a6a3aa1c.6f7288",
+        "f4089fab.088a2"
       ]
     ]
   },
   {
-    "id": "889b0a64.f04af",
+    "id": "92327400.5b0ea",
     "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": 5189,
-    "y": 1207,
-    "z": "f8944603.71553",
+    "x": 5181.566665649414,
+    "y": 1218,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b062763c.d2a4c",
+    "id": "36ef2efb.214b2a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5369,
-    "y": 1250,
-    "z": "f8944603.71553",
+    "x": 5361.566665649414,
+    "y": 1261,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "be5642b7.4ae158"
+        "8d49602b.5cbbb8"
       ]
     ]
   },
   {
-    "id": "54b52301.01aeac",
+    "id": "a6a3aa1c.6f7288",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5361,
-    "y": 1305,
-    "z": "f8944603.71553",
+    "x": 5353.566665649414,
+    "y": 1316,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4c818fe4.79442"
+        "2502bb8.26e4744"
       ]
     ]
   },
   {
-    "id": "c657b443.273d9",
+    "id": "f4089fab.088a2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5366,
-    "y": 1362,
-    "z": "f8944603.71553",
+    "x": 5358.566665649414,
+    "y": 1373,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "efb52045.6ba93"
+        "192598bd.b5d887"
       ]
     ]
   },
   {
-    "id": "efb52045.6ba93",
+    "id": "192598bd.b5d887",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5518,
-    "y": 1363,
-    "z": "f8944603.71553",
+    "x": 5510.566665649414,
+    "y": 1374,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "4c818fe4.79442",
+    "id": "2502bb8.26e4744",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5529,
-    "y": 1308,
-    "z": "f8944603.71553",
+    "x": 5521.566665649414,
+    "y": 1319,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "be5642b7.4ae158",
+    "id": "8d49602b.5cbbb8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5513.38232421875,
-    "y": 1247.6556701660156,
-    "z": "f8944603.71553",
+    "x": 5505.948989868164,
+    "y": 1258.6556701660156,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6763b660.709548"
+        "34dd56c8.a561f2"
       ]
     ]
   },
   {
-    "id": "7fcaaf72.ffd618",
+    "id": "a745e5da.a32578",
     "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": 5189,
-    "y": 1450,
-    "z": "f8944603.71553",
+    "x": 5181.566665649414,
+    "y": 1461,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6763b660.709548",
+    "id": "34dd56c8.a561f2",
     "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": 5728,
-    "y": 1244,
-    "z": "f8944603.71553",
+    "x": 5720.566665649414,
+    "y": 1255,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "1bc82fcd.e38b3",
+    "id": "9cc65469.2e5488",
     "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.999969482422,
-    "y": 528.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4370.566635131836,
+    "y": 539.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "1ea9819.2a7577e",
+    "id": "bae36160.d0fbc",
     "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.999969482422,
-    "y": 626.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4361.566635131836,
+    "y": 637.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "86b880d.ad45d",
+    "id": "6429cd23.35e7c4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4202.999969482422,
-    "y": 534.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4195.566635131836,
+    "y": 545.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4ebe65d0.3ec92c",
-        "1bc82fcd.e38b3"
+        "d98ccbbe.37e04",
+        "9cc65469.2e5488"
       ]
     ]
   },
   {
-    "id": "10eaea8a.998afd",
+    "id": "17c9fbf5.2a0a34",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.999969482422,
-    "y": 598.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4201.566635131836,
+    "y": 609.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b5b3e89e.18b28",
-        "1ea9819.2a7577e"
+        "449eb720.722948",
+        "bae36160.d0fbc"
       ]
     ]
   },
   {
-    "id": "e84921e.f8ecce",
+    "id": "22d232ad.fa9d6e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4227,
-    "y": 811,
-    "z": "f8944603.71553",
+    "x": 4219.566665649414,
+    "y": 822,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "81270995.5d712",
-        "aacd9933.603dc8"
+        "83bfbc5.ae6994",
+        "7c60504e.d38f7"
       ]
     ]
   },
   {
-    "id": "b7ebf9b7.e2f348",
+    "id": "5c001c7.14606e4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4230,
-    "y": 864,
-    "z": "f8944603.71553",
+    "x": 4222.566665649414,
+    "y": 875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7db54dd4.f36624",
-        "bffe7efa.872038"
+        "5244a859.c728e8",
+        "9835c9a0.4caf78"
       ]
     ]
   },
   {
-    "id": "aacd9933.603dc8",
+    "id": "7c60504e.d38f7",
     "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": 4387,
-    "y": 824,
-    "z": "f8944603.71553",
+    "x": 4379.566665649414,
+    "y": 835,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "bffe7efa.872038",
+    "id": "9835c9a0.4caf78",
     "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": 4390,
-    "y": 915,
-    "z": "f8944603.71553",
+    "x": 4382.566665649414,
+    "y": 926,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "786dd6d1.bb9f",
+    "id": "c2220864.024798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3681.999969482422,
-    "y": 2041.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3674.566635131836,
+    "y": 2052.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ced1d6e7.1761a",
-        "debfaec3.11449"
+        "b80ff39a.5788d",
+        "d5ffb970.fa1968"
       ]
     ]
   },
   {
-    "id": "4b469f00.bbd698",
+    "id": "db8ae4f9.347f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.333465576172,
-    "y": 2042.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3501.900131225586,
+    "y": 2053.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "786dd6d1.bb9f"
+        "c2220864.024798"
       ]
     ]
   },
   {
-    "id": "abe29976.f7b82",
+    "id": "4d1c7431.f53f04",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3518.824432373047,
-    "y": 2085.574005126953,
-    "z": "f8944603.71553",
+    "x": 3511.391098022461,
+    "y": 2096.574005126953,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fd5b7bb5.9eb778"
+        "c720d68c.d6ef88"
       ]
     ]
   },
   {
-    "id": "df5e24e1.4bbfc8",
+    "id": "f027027b.1605f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3507.333465576172,
-    "y": 2131.999969482422,
-    "z": "f8944603.71553",
+    "x": 3499.900131225586,
+    "y": 2142.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8efc96df.7aca9"
+        "174ecc35.cb4194"
       ]
     ]
   },
   {
-    "id": "fd5b7bb5.9eb778",
+    "id": "c720d68c.d6ef88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3672.3958435058594,
-    "y": 2088.8597412109375,
-    "z": "f8944603.71553",
+    "x": 3664.9625091552734,
+    "y": 2099.8597412109375,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "8efc96df.7aca9",
+    "id": "174ecc35.cb4194",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3676.333465576172,
-    "y": 2132.999969482422,
-    "z": "f8944603.71553",
+    "x": 3668.900131225586,
+    "y": 2143.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "ced1d6e7.1761a",
+    "id": "b80ff39a.5788d",
     "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": 3968.333465576172,
-    "y": 2046.0000915527344,
-    "z": "f8944603.71553",
+    "x": 3960.900131225586,
+    "y": 2057.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8ff8205e.94493",
-        "d23599ca.696b88"
+        "f5a758df.e8e0d8",
+        "83d46017.2ef77"
       ]
     ]
   },
   {
-    "id": "d23599ca.696b88",
+    "id": "83d46017.2ef77",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4191.333465576172,
-    "y": 2001.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4183.900131225586,
+    "y": 2012.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9c58fe22.c1b4f8"
+        "128bbd7c.ee7803"
       ]
     ]
   },
   {
-    "id": "8ff8205e.94493",
+    "id": "f5a758df.e8e0d8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4193.333465576172,
-    "y": 2065.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4185.900131225586,
+    "y": 2076.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f9f53a1b.e6879"
+        "7922a686.9432f8"
       ]
     ]
   },
   {
-    "id": "f9f53a1b.e6879",
+    "id": "7922a686.9432f8",
     "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": 4352.333465576172,
-    "y": 2084.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4344.900131225586,
+    "y": 2095.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9c58fe22.c1b4f8",
+    "id": "128bbd7c.ee7803",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4356.333465576172,
-    "y": 1998.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4348.900131225586,
+    "y": 2009.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a3891ddf.35707",
-        "dedb2135.03f5b8"
+        "ecc94bdb.36f218",
+        "70d8643e.5fc584"
       ]
     ]
   },
   {
-    "id": "b18620c8.640928",
+    "id": "dd28e890.6f37f",
     "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": 3281.333465576172,
-    "y": 2077.999969482422,
-    "z": "f8944603.71553",
+    "x": 3273.900131225586,
+    "y": 2088.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4b469f00.bbd698",
-        "abe29976.f7b82",
-        "df5e24e1.4bbfc8"
+        "db8ae4f9.347f",
+        "4d1c7431.f53f04",
+        "f027027b.1605f8"
       ]
     ]
   },
   {
-    "id": "2363f2d1.c22566",
+    "id": "6cb9de7.531902",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3242.333465576172,
-    "y": 2021.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3234.900131225586,
+    "y": 2032.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d6e1611b.9ddcf",
+    "id": "d3754757.4f2538",
     "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": 3301.333465576172,
-    "y": 1817.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3293.900131225586,
+    "y": 1828.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cf2f2f41.e3b378",
-        "39e668ff.f44578"
+        "c926dd8a.c40d78",
+        "b866a3cd.1307c8"
       ]
     ]
   },
   {
-    "id": "39e668ff.f44578",
+    "id": "b866a3cd.1307c8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3524.333465576172,
-    "y": 1803.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3516.900131225586,
+    "y": 1814.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a19c910d.573ee"
+        "963b51c2.5c60a8"
       ]
     ]
   },
   {
-    "id": "cf2f2f41.e3b378",
+    "id": "c926dd8a.c40d78",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3526.333465576172,
-    "y": 1836.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3518.900131225586,
+    "y": 1847.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "13f310d4.058aff"
+        "288c4b3e.38e3ac"
       ]
     ]
   },
   {
-    "id": "13f310d4.058aff",
+    "id": "288c4b3e.38e3ac",
     "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": 3669.333465576172,
-    "y": 1833.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3661.900131225586,
+    "y": 1844.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a19c910d.573ee",
+    "id": "963b51c2.5c60a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3672.333465576172,
-    "y": 1796.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3664.900131225586,
+    "y": 1807.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f7d74c47.1bc978",
-        "f5bac544.61fa48"
+        "dba238c.ade58c8",
+        "11c5499c.e33516"
       ]
     ]
   },
   {
-    "id": "f7d74c47.1bc978",
+    "id": "dba238c.ade58c8",
     "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": 3866.333465576172,
-    "y": 1800.0000915527344,
-    "z": "f8944603.71553",
+    "x": 3858.900131225586,
+    "y": 1811.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "debfaec3.11449",
+    "id": "d5ffb970.fa1968",
     "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": 3919.3334350585938,
-    "y": 2168.9999389648438,
-    "z": "f8944603.71553",
+    "x": 3911.900100708008,
+    "y": 2179.9999389648438,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9615e6c.711fd18"
+        "8ab0c323.e760e"
       ]
     ]
   },
   {
-    "id": "9615e6c.711fd18",
+    "id": "8ab0c323.e760e",
     "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": 4125.333435058594,
-    "y": 2168.9999389648438,
-    "z": "f8944603.71553",
+    "x": 4117.900100708008,
+    "y": 2179.9999389648438,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cbe4341f.004078"
+        "ef601430.2ce96"
       ]
     ]
   },
   {
-    "id": "cbe4341f.004078",
+    "id": "ef601430.2ce96",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4342.619079589844,
-    "y": 2167.8217163085938,
-    "z": "f8944603.71553",
+    "x": 4335.185745239258,
+    "y": 2178.8217163085938,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c7f950c4.309208"
+        "e64538ad.e88608"
       ]
     ]
   },
   {
-    "id": "f5bac544.61fa48",
+    "id": "11c5499c.e33516",
     "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": 3888.333465576172,
-    "y": 1868.0000915527344,
-    "z": "f8944603.71553",
+    "x": 3880.900131225586,
+    "y": 1879.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2c3b0cc0.e9a8bc",
-        "964d0d68.ea7238",
-        "c9fecb15.92dc4"
+        "72da73e.01fae8c",
+        "1bf4f20c.844916",
+        "c2abc766.4ac0f"
       ]
     ]
   },
   {
-    "id": "2c3b0cc0.e9a8bc",
+    "id": "72da73e.01fae8c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4083.8335876464844,
-    "y": 1820.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4076.4002532958984,
+    "y": 1831.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d8e08a6a.bad6c"
+        "e5dd1f31.8ac458"
       ]
     ]
   },
   {
-    "id": "964d0d68.ea7238",
+    "id": "1bf4f20c.844916",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4075.8335876464844,
-    "y": 1875.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4068.4002532958984,
+    "y": 1886.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "30330606.c5c78a"
+        "2c7c5a6c.8f4a66"
       ]
     ]
   },
   {
-    "id": "c9fecb15.92dc4",
+    "id": "c2abc766.4ac0f",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.8335876464844,
-    "y": 1932.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4073.4002532958984,
+    "y": 1943.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7d5217b1.764cf"
+        "a0f15b8e.a7ebb"
       ]
     ]
   },
   {
-    "id": "7d5217b1.764cf",
+    "id": "a0f15b8e.a7ebb",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4232.833587646484,
-    "y": 1933.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4225.400253295898,
+    "y": 1944.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "30330606.c5c78a",
+    "id": "2c7c5a6c.8f4a66",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4243.833587646484,
-    "y": 1878.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4236.400253295898,
+    "y": 1889.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d8e08a6a.bad6c",
+    "id": "e5dd1f31.8ac458",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4228.215911865234,
-    "y": 1817.65576171875,
-    "z": "f8944603.71553",
+    "x": 4220.782577514648,
+    "y": 1828.65576171875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "57c065bf.a4bd5c"
+        "5bc7c506.3f7314"
       ]
     ]
   },
   {
-    "id": "a3891ddf.35707",
+    "id": "ecc94bdb.36f218",
     "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": 4526.333465576172,
-    "y": 1959.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4518.900131225586,
+    "y": 1970.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "dedb2135.03f5b8",
+    "id": "70d8643e.5fc584",
     "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": 4527.333465576172,
-    "y": 2064.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4519.900131225586,
+    "y": 2075.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cd4b037.d584a",
+    "id": "75e052b3.6ff0fc",
     "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": 4522.333465576172,
-    "y": 2013.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4514.900131225586,
+    "y": 2024.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c7f950c4.309208",
+    "id": "e64538ad.e88608",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4549.450622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4542.017288208008,
+    "y": 2168.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "dd90bf13.7024b8",
-        "71302a26.8b2194",
-        "1d143619.b4c942"
+        "58b39a0b.a28104",
+        "908d048a.fd0138",
+        "5394d746.97415"
       ]
     ]
   },
   {
-    "id": "dd90bf13.7024b8",
+    "id": "58b39a0b.a28104",
     "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": 4764.450622558594,
-    "y": 2119.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4757.017288208008,
+    "y": 2130.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "71302a26.8b2194",
+    "id": "908d048a.fd0138",
     "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": 4761.450622558594,
-    "y": 2158.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4754.017288208008,
+    "y": 2169.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d8986410.1ab67"
+        "160d9213.6a516e"
       ]
     ]
   },
   {
-    "id": "1d143619.b4c942",
+    "id": "5394d746.97415",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4716.950622558594,
-    "y": 2200.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4709.517288208008,
+    "y": 2211.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d8986410.1ab67",
+    "id": "160d9213.6a516e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4941.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4934.517288208008,
+    "y": 2168.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ce977a1e.eca43"
+        "2403cbf1.90bae4"
       ]
     ]
   },
   {
-    "id": "ce977a1e.eca43",
+    "id": "2403cbf1.90bae4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5099.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 5092.517288208008,
+    "y": 2168.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fad51809.c9b758"
+        "15dae2c1.fe6bdd"
       ]
     ]
   },
   {
-    "id": "fad51809.c9b758",
+    "id": "15dae2c1.fe6bdd",
     "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": 5306.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 5299.517288208008,
+    "y": 2168.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3e817052.af0e48",
+    "id": "e7ce121f.269bb",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4810.333465576172,
-    "y": 1836.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4802.900131225586,
+    "y": 1847.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "41d964fa.bed18c"
+        "30725ca7.222ea4"
       ]
     ]
   },
   {
-    "id": "41d964fa.bed18c",
+    "id": "30725ca7.222ea4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4987.333465576172,
-    "y": 1828.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4979.900131225586,
+    "y": 1839.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "286abe4.161a1c2",
-        "51859ea0.e5a788"
+        "82bc9190.99083",
+        "c6a75ef3.9aa488"
       ]
     ]
   },
   {
-    "id": "57c065bf.a4bd5c",
+    "id": "5bc7c506.3f7314",
     "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": 4412.333465576172,
-    "y": 1832.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4404.900131225586,
+    "y": 1843.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "89b46226.1281f"
+        "9e2fa3d8.88246"
       ]
     ]
   },
   {
-    "id": "89b46226.1281f",
+    "id": "9e2fa3d8.88246",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4607.333465576172,
-    "y": 1832.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4599.900131225586,
+    "y": 1843.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3e817052.af0e48",
-        "56bdf4f5.249c24"
+        "e7ce121f.269bb",
+        "87abf2c8.a21648"
       ]
     ]
   },
   {
-    "id": "51859ea0.e5a788",
+    "id": "c6a75ef3.9aa488",
     "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": 5195.333465576172,
-    "y": 1835.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5187.900131225586,
+    "y": 1846.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d1ce3d2f.531928",
-        "ba2a8dba.a8d52",
-        "4ba192d1.030d84"
+        "d33681ca.12c55",
+        "54cfcb70.c20a5c",
+        "76901bc2.c646ec"
       ]
     ]
   },
   {
-    "id": "f8a3b14d.675a5",
+    "id": "c7485083.08e3d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4989.333465576172,
-    "y": 1901.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4981.900131225586,
+    "y": 1912.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "25c16268.66f006"
+        "9f7ab33f.3d3ee8"
       ]
     ]
   },
   {
-    "id": "56bdf4f5.249c24",
+    "id": "87abf2c8.a21648",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4812.333465576172,
-    "y": 1909.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4804.900131225586,
+    "y": 1920.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f8a3b14d.675a5"
+        "c7485083.08e3d"
       ]
     ]
   },
   {
-    "id": "286abe4.161a1c2",
+    "id": "82bc9190.99083",
     "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": 5225.333465576172,
-    "y": 1783.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5217.900131225586,
+    "y": 1794.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "25c16268.66f006",
+    "id": "9f7ab33f.3d3ee8",
     "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": 5224.333465576172,
-    "y": 2025.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5216.900131225586,
+    "y": 2036.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d1ce3d2f.531928",
+    "id": "d33681ca.12c55",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5405.333465576172,
-    "y": 1826.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5397.900131225586,
+    "y": 1837.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9d788655.20f98"
+        "52bdc174.53236"
       ]
     ]
   },
   {
-    "id": "ba2a8dba.a8d52",
+    "id": "54cfcb70.c20a5c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5397.333465576172,
-    "y": 1881.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5389.900131225586,
+    "y": 1892.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "96363bdc.091"
+        "da0362e9.7cf8b8"
       ]
     ]
   },
   {
-    "id": "4ba192d1.030d84",
+    "id": "76901bc2.c646ec",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.333465576172,
-    "y": 1938.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5394.900131225586,
+    "y": 1949.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6a0588e1.3fd2b8"
+        "656ad13e.13aaf8"
       ]
     ]
   },
   {
-    "id": "6a0588e1.3fd2b8",
+    "id": "656ad13e.13aaf8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5554.333465576172,
-    "y": 1939.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5546.900131225586,
+    "y": 1950.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "96363bdc.091",
+    "id": "da0362e9.7cf8b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5565.333465576172,
-    "y": 1884.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5557.900131225586,
+    "y": 1895.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9d788655.20f98",
+    "id": "52bdc174.53236",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5549.715789794922,
-    "y": 1823.65576171875,
-    "z": "f8944603.71553",
+    "x": 5542.282455444336,
+    "y": 1834.65576171875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f42174ac.a42b5"
+        "2dd4dc53.801b1c"
       ]
     ]
   },
   {
-    "id": "f42174ac.a42b5",
+    "id": "2dd4dc53.801b1c",
     "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": 5764.333465576172,
-    "y": 1820.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5756.900131225586,
+    "y": 1831.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "11e0f934.faeab7",
+    "id": "10147ab3.fed6fd",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3248.999969482422,
-    "y": 1638.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3241.566635131836,
+    "y": 1649.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "87d62238.4ede38",
+    "id": "bb3da11a.4b756",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4544.999969482422,
-    "y": 612.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4537.566635131836,
+    "y": 623.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "da6b2335.2cb2",
+    "id": "550747e5.fd6e4",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4555,
-    "y": 809,
-    "z": "f8944603.71553",
+    "x": 4547.566665649414,
+    "y": 820,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b71f57a7.e2a288",
+    "id": "425867c4.b0a9",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3251.9999389648438,
-    "y": 2146.9999389648438,
-    "z": "f8944603.71553",
+    "x": 3244.566604614258,
+    "y": 2157.9999389648438,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f7d11626.bd108",
+    "id": "e3e1a44c.9927b8",
     "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": 3389,
-    "y": 2803,
-    "z": "f8944603.71553",
+    "x": 3381.566665649414,
+    "y": 2814,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "7d22810d.66642",
+    "id": "4a62d4e.fca9aac",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3266,
-    "y": 2913,
-    "z": "f8944603.71553",
+    "x": 3258.566665649414,
+    "y": 2924,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "74458dfb.e82acc",
-        "6d43d493.c2ab14"
+        "81493f2.f26234",
+        "6c24115d.c6e7c"
       ]
     ]
   },
   {
-    "id": "74458dfb.e82acc",
+    "id": "81493f2.f26234",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3450,
-    "y": 2892,
-    "z": "f8944603.71553",
+    "x": 3442.566665649414,
+    "y": 2903,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "bd8c7362.5e86a8"
+        "3aff0eaf.ff7b7a"
       ]
     ]
   },
   {
-    "id": "6d43d493.c2ab14",
+    "id": "6c24115d.c6e7c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3342,
-    "y": 5070,
-    "z": "f8944603.71553",
+    "x": 3334.566665649414,
+    "y": 5081,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f235a0e0.02a8"
+        "5bc4950a.db01dc"
       ]
     ]
   },
   {
-    "id": "f235a0e0.02a8",
+    "id": "5bc4950a.db01dc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3497,
-    "y": 5063,
-    "z": "f8944603.71553",
+    "x": 3489.566665649414,
+    "y": 5074,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "69d3ed18.577c3c",
-        "f2a7dc4a.68ede",
-        "a789852e.51cd48",
-        "434bd8c2.bae4f8",
-        "cd1fc06c.124968",
-        "c32fbe2a.4ce3f"
+        "2f2701b5.2dac16",
+        "316110e0.e54cc",
+        "b160de6d.e8ced8",
+        "595e7f4b.3b8bd8",
+        "8bf8bc6f.53ce6",
+        "1e2222c.7b917dd"
       ]
     ]
   },
   {
-    "id": "bd8c7362.5e86a8",
+    "id": "3aff0eaf.ff7b7a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3593,
-    "y": 2892,
-    "z": "f8944603.71553",
+    "x": 3585.566665649414,
+    "y": 2903,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "edf6563f.502118",
-        "59e68189.ade8e8",
-        "39d89d00.a48b3c",
-        "f51c657e.c3fcc8",
-        "3b5e2d55.c49c42",
-        "c40c923d.ffb318",
-        "3d1335ab.d13122",
-        "441ba30c.ae2a1c",
-        "5bfaebb4.b0d114",
-        "32f3c697.c51f22",
-        "f60b0d1b.343218",
-        "51fbee04.79f4f",
-        "a2a5771a.032e88",
-        "a39c337f.4b8598",
-        "f9369eb9.dd61b",
-        "dad20130.739d78",
-        "124ab46d.2d752c",
-        "fdfcc8c4.b3e8a8",
-        "8b9dcfa3.01c508",
-        "87dcb71b.a618f",
-        "286f0ec8.852352",
-        "2bbca6cc.0ec622"
+        "5168a07f.a36df8",
+        "6c599b75.a60fcc",
+        "35850a83.44a89e",
+        "ae160236.4157c8",
+        "b7fd9c88.558b98",
+        "6e041a0e.19b3cc",
+        "612f5852.aaa57",
+        "8d9898f5.dd7e",
+        "638e1104.d7c428",
+        "d797d3a4.8fe9",
+        "ce4e4e08.0ce56",
+        "a4cacc19.7d376",
+        "57e31ea9.c7173",
+        "bf6be8f0.fb6c88",
+        "982a1a56.4966b8",
+        "8feec705.936fd8",
+        "eb6eb29c.21a438",
+        "cad73781.1cf898",
+        "bdd8ea07.2740c",
+        "8877dbf4.9fef7",
+        "374b533b.d2c934",
+        "e008f489.a45f08"
       ]
     ]
   },
   {
-    "id": "5bfaebb4.b0d114",
+    "id": "638e1104.d7c428",
     "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": 3903,
-    "y": 3207,
-    "z": "f8944603.71553",
+    "x": 3895.566665649414,
+    "y": 3218,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "edf6563f.502118",
+    "id": "5168a07f.a36df8",
     "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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3851,
-    "y": 3249,
-    "z": "f8944603.71553",
+    "x": 3843.566665649414,
+    "y": 3260,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "59e68189.ade8e8",
+    "id": "6c599b75.a60fcc",
     "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": 3980,
-    "y": 3291,
-    "z": "f8944603.71553",
+    "x": 3972.566665649414,
+    "y": 3302,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c425c4b.b5f8838",
+    "id": "e80dd6ae.f178",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3826,
-    "y": 3166,
-    "z": "f8944603.71553",
+    "x": 3818.566665649414,
+    "y": 3177,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "78e08e98.7c634",
+    "id": "b4b36e39.27fc08",
     "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": 4351,
-    "y": 3687,
-    "z": "f8944603.71553",
+    "x": 4343.566665649414,
+    "y": 3698,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "39d89d00.a48b3c",
+    "id": "35850a83.44a89e",
     "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": 3915,
-    "y": 3726,
-    "z": "f8944603.71553",
+    "x": 3907.566665649414,
+    "y": 3737,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f51c657e.c3fcc8",
+    "id": "ae160236.4157c8",
     "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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3863,
-    "y": 3777,
-    "z": "f8944603.71553",
+    "x": 3855.566665649414,
+    "y": 3788,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "3b5e2d55.c49c42",
+    "id": "b7fd9c88.558b98",
     "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": 3999,
-    "y": 3824,
-    "z": "f8944603.71553",
+    "x": 3991.566665649414,
+    "y": 3835,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "62d7e2a.9cbc61c",
+    "id": "f07a7af4.49b438",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3856,
-    "y": 3686,
-    "z": "f8944603.71553",
+    "x": 3848.566665649414,
+    "y": 3697,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "1f0597e7.f750d8",
+    "id": "d7c1d718.25aef8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4286,
-    "y": 3883,
-    "z": "f8944603.71553",
+    "x": 4278.566665649414,
+    "y": 3894,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c40c923d.ffb318",
+    "id": "6e041a0e.19b3cc",
     "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": 3877,
-    "y": 3930,
-    "z": "f8944603.71553",
+    "x": 3869.566665649414,
+    "y": 3941,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b2dc6149.43ec28",
-        "f8c162ee.8e2a8",
-        "a8c36503.377908"
+        "3be15b0.8cc9ea6",
+        "8fcafedd.8f9ff8",
+        "74f3c2d6.5194d4"
       ]
     ]
   },
   {
-    "id": "b2dc6149.43ec28",
+    "id": "3be15b0.8cc9ea6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4124,
-    "y": 3884,
-    "z": "f8944603.71553",
+    "x": 4116.566665649414,
+    "y": 3895,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1f0597e7.f750d8"
+        "d7c1d718.25aef8"
       ]
     ]
   },
   {
-    "id": "f8c162ee.8e2a8",
+    "id": "8fcafedd.8f9ff8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4124.490966796875,
-    "y": 3929.5740356445312,
-    "z": "f8944603.71553",
+    "x": 4117.057632446289,
+    "y": 3940.5740356445312,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "244505cb.7c97da"
+        "535b8241.bba134"
       ]
     ]
   },
   {
-    "id": "a8c36503.377908",
+    "id": "74f3c2d6.5194d4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4122,
-    "y": 3973,
-    "z": "f8944603.71553",
+    "x": 4114.566665649414,
+    "y": 3984,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fac0a6c3.57a578"
+        "4abd8099.5640c"
       ]
     ]
   },
   {
-    "id": "244505cb.7c97da",
+    "id": "535b8241.bba134",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4287.0623779296875,
-    "y": 3929.8597717285156,
-    "z": "f8944603.71553",
+    "x": 4279.629043579102,
+    "y": 3940.8597717285156,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fac0a6c3.57a578",
+    "id": "4abd8099.5640c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4291,
-    "y": 3974,
-    "z": "f8944603.71553",
+    "x": 4283.566665649414,
+    "y": 3985,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f9369eb9.dd61b",
+    "id": "982a1a56.4966b8",
     "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": 3931,
-    "y": 4272,
-    "z": "f8944603.71553",
+    "x": 3923.566665649414,
+    "y": 4283,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "dad20130.739d78",
+    "id": "8feec705.936fd8",
     "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": 3934,
-    "y": 4317,
-    "z": "f8944603.71553",
+    "x": 3926.566665649414,
+    "y": 4328,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "fdfcc8c4.b3e8a8",
+    "id": "cad73781.1cf898",
     "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": 3926,
-    "y": 4045,
-    "z": "f8944603.71553",
+    "x": 3918.566665649414,
+    "y": 4056,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "8b9dcfa3.01c508",
+    "id": "bdd8ea07.2740c",
     "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": 3928,
-    "y": 4092,
-    "z": "f8944603.71553",
+    "x": 3920.566665649414,
+    "y": 4103,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed841a30.7664d",
+    "id": "b21853e4.c6418",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3847,
-    "y": 4225,
-    "z": "f8944603.71553",
+    "x": 3839.566665649414,
+    "y": 4236,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7144ff5f.c519e8",
+    "id": "f1842c11.743b7",
     "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": 4457,
-    "y": 4891,
-    "z": "f8944603.71553",
+    "x": 4449.566665649414,
+    "y": 4902,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "69d3ed18.577c3c",
+    "id": "2f2701b5.2dac16",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3712,
-    "y": 5044,
-    "z": "f8944603.71553",
+    "x": 3704.566665649414,
+    "y": 5055,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ae7574f4.3ebe3",
-        "8bd2d4fd.8c4f1"
+        "bb4138b0.4e1d88",
+        "3497566e.93319a"
       ]
     ]
   },
   {
-    "id": "8bd2d4fd.8c4f1",
+    "id": "3497566e.93319a",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3884,
-    "y": 5041,
-    "z": "f8944603.71553",
+    "x": 3876.566665649414,
+    "y": 5052,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "439959aa.a8d0e"
+        "c7f4755e.39d608"
       ]
     ]
   },
   {
-    "id": "ae7574f4.3ebe3",
+    "id": "bb4138b0.4e1d88",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3836,
-    "y": 5888,
-    "z": "f8944603.71553",
+    "x": 3828.566665649414,
+    "y": 5899,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b05d129.ef1b1f"
+        "6c4c0ada.7452e4"
       ]
     ]
   },
   {
-    "id": "bbd89123.3c84c8",
+    "id": "4c3530ee.3fa66",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3897,
-    "y": 5011,
-    "z": "f8944603.71553",
+    "x": 3889.566665649414,
+    "y": 5022,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "88e636e4.0ad278",
+    "id": "56d0be77.8f738",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3907,
-    "y": 5846,
-    "z": "f8944603.71553",
+    "x": 3899.566665649414,
+    "y": 5857,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3d1335ab.d13122",
+    "id": "612f5852.aaa57",
     "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": 3930,
-    "y": 4420,
-    "z": "f8944603.71553",
+    "x": 3922.566665649414,
+    "y": 4431,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "439959aa.a8d0e",
+    "id": "c7f4755e.39d608",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4060,
-    "y": 5043,
-    "z": "f8944603.71553",
+    "x": 4052.566665649414,
+    "y": 5054,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "398ca5b9.10ae92",
-        "26315d76.5ba5da",
-        "70413194.4e4218",
-        "36f7b692.fe5f9a",
-        "23762b83.94d65c",
-        "1981b041.f96778",
-        "7144ff5f.c519e8",
-        "d1a4e2c9.15ac9",
-        "24040f90.d6a4"
+        "230e1b13.237ccc",
+        "5181bb49.6fa9a4",
+        "fd0048f2.8665c8",
+        "78647ab5.49b354",
+        "f0982e54.06c37",
+        "828e934c.bce518",
+        "f1842c11.743b7",
+        "76d94500.85b34c",
+        "66bf889f.a4f118"
       ]
     ]
   },
   {
-    "id": "9b6d23e8.2f4c1",
+    "id": "ae961dcf.a0b6c",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5505,
-    "y": 4516,
-    "z": "f8944603.71553",
+    "x": 5497.566665649414,
+    "y": 4527,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "398ca5b9.10ae92",
+    "id": "230e1b13.237ccc",
     "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": 4438,
-    "y": 5546,
-    "z": "f8944603.71553",
+    "x": 4430.566665649414,
+    "y": 5557,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "441ba30c.ae2a1c",
+    "id": "8d9898f5.dd7e",
     "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": 3909,
-    "y": 3420,
-    "z": "f8944603.71553",
+    "x": 3901.566665649414,
+    "y": 3431,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "32f3c697.c51f22",
+    "id": "d797d3a4.8fe9",
     "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": 3907,
-    "y": 2877,
-    "z": "f8944603.71553",
+    "x": 3899.566665649414,
+    "y": 2888,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f60b0d1b.343218",
+    "id": "ce4e4e08.0ce56",
     "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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3855,
-    "y": 2925,
-    "z": "f8944603.71553",
+    "x": 3847.566665649414,
+    "y": 2936,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "51fbee04.79f4f",
+    "id": "a4cacc19.7d376",
     "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": 3983,
-    "y": 2972,
-    "z": "f8944603.71553",
+    "x": 3975.566665649414,
+    "y": 2983,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f3326814.1ece9",
+    "id": "ae968df.974b9f",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3820,
-    "y": 2835,
-    "z": "f8944603.71553",
+    "x": 3812.566665649414,
+    "y": 2846,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a2a5771a.032e88",
+    "id": "57e31ea9.c7173",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3817,
-    "y": 3063,
-    "z": "f8944603.71553",
+    "x": 3809.566665649414,
+    "y": 3074,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "a39c337f.4b8598",
+    "id": "bf6be8f0.fb6c88",
     "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": 3910,
-    "y": 3116,
-    "z": "f8944603.71553",
+    "x": 3902.566665649414,
+    "y": 3127,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "71641615.6f44c8",
+    "id": "155d8942.126f0f",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3801,
-    "y": 3019,
-    "z": "f8944603.71553",
+    "x": 3793.566665649414,
+    "y": 3030,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "11067d29.f83e4b",
+    "id": "eda430a0.e8a4b8",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3805,
-    "y": 3335,
-    "z": "f8944603.71553",
+    "x": 3797.566665649414,
+    "y": 3346,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "36f7b692.fe5f9a",
+    "id": "78647ab5.49b354",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4374,
-    "y": 4524,
-    "z": "f8944603.71553",
+    "x": 4366.566665649414,
+    "y": 4535,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "fa6ec7f0.b5b858",
+    "id": "db99df8c.8021",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4358,
-    "y": 4480,
-    "z": "f8944603.71553",
+    "x": 4350.566665649414,
+    "y": 4491,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "87e40dc2.3dae2",
+    "id": "fea8fd97.74e2c8",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5105,
-    "y": 4511,
-    "z": "f8944603.71553",
+    "x": 5097.566665649414,
+    "y": 4522,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a4406b4c.17bbc",
+    "id": "5a0b429f.b8f42c",
     "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": 5192,
-    "y": 4553,
-    "z": "f8944603.71553",
+    "x": 5184.566665649414,
+    "y": 4564,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "18ca4a3.634f536",
+    "id": "5930a956.25a2b",
     "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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5140,
-    "y": 4601,
-    "z": "f8944603.71553",
+    "x": 5132.566665649414,
+    "y": 4612,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4f57662.21d798",
+    "id": "8f7ba394.827068",
     "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": 5268,
-    "y": 4648,
-    "z": "f8944603.71553",
+    "x": 5260.566665649414,
+    "y": 4659,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "1981b041.f96778",
+    "id": "828e934c.bce518",
     "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": 4445,
-    "y": 4933,
-    "z": "f8944603.71553",
+    "x": 4437.566665649414,
+    "y": 4944,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ff0ab3b.554fd5",
+    "id": "29a2a107.550e86",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4428,
-    "y": 4995,
-    "z": "f8944603.71553",
+    "x": 4420.566665649414,
+    "y": 5006,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "26315d76.5ba5da",
+    "id": "5181bb49.6fa9a4",
     "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": 4539,
-    "y": 5037,
-    "z": "f8944603.71553",
+    "x": 4531.566665649414,
+    "y": 5048,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "99476299.d65948",
+    "id": "a3e1b718.3ad9",
     "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": 4987,
-    "y": 5090,
-    "z": "f8944603.71553",
+    "x": 4979.566665649414,
+    "y": 5101,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7e1b41de.44cf5",
+    "id": "778aa80b.aa4e1",
     "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": 4297,
-    "y": 5788,
-    "z": "f8944603.71553",
+    "x": 4289.566665649414,
+    "y": 5799,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "99207b39.65e8d8",
+    "id": "5829dcc0.7722b4",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4195,
-    "y": 5737,
-    "z": "f8944603.71553",
+    "x": 4187.566665649414,
+    "y": 5748,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "fc9d3b48.0b961",
+    "id": "e74f47d7.82472",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4179,
-    "y": 5693,
-    "z": "f8944603.71553",
+    "x": 4171.566665649414,
+    "y": 5704,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cdbca407.a3714",
+    "id": "edf4200a.b4f218",
     "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": 4965,
-    "y": 5950,
-    "z": "f8944603.71553",
+    "x": 4957.566665649414,
+    "y": 5961,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "70413194.4e4218",
+    "id": "fd0048f2.8665c8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366,
-    "y": 5094,
-    "z": "f8944603.71553",
+    "x": 4358.566665649414,
+    "y": 5105,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9e68e3f9.d79778",
-        "3f3ed24c.0decee"
+        "ad0bda8.59e5ba8",
+        "a82a76f3.4e09c"
       ]
     ]
   },
   {
-    "id": "9e68e3f9.d79778",
+    "id": "ad0bda8.59e5ba8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4577,
-    "y": 5094,
-    "z": "f8944603.71553",
+    "x": 4569.566665649414,
+    "y": 5105,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e924e4da.1f13b"
+        "85a5596f.5bdcf8"
       ]
     ]
   },
   {
-    "id": "e924e4da.1f13b",
+    "id": "85a5596f.5bdcf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4733,
-    "y": 5090,
-    "z": "f8944603.71553",
+    "x": 4725.566665649414,
+    "y": 5101,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "99476299.d65948",
-        "259aff1b.d97a1",
-        "b61f1c95.4694d"
+        "a3e1b718.3ad9",
+        "31466e0d.9a3dba",
+        "19c788e0.a62557"
       ]
     ]
   },
   {
-    "id": "3f3ed24c.0decee",
+    "id": "a82a76f3.4e09c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573,
-    "y": 5142,
-    "z": "f8944603.71553",
+    "x": 4565.566665649414,
+    "y": 5153,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6bc2c49e.5247fc"
+        "9fc5ee1f.667928"
       ]
     ]
   },
   {
-    "id": "6bc2c49e.5247fc",
+    "id": "9fc5ee1f.667928",
     "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": 4721,
-    "y": 5137,
-    "z": "f8944603.71553",
+    "x": 4713.566665649414,
+    "y": 5148,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "540d81b.ac8608",
+    "id": "4161f07f.2b4a78",
     "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": 5229,
-    "y": 4719,
-    "z": "f8944603.71553",
+    "x": 5221.566665649414,
+    "y": 4730,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "e8527008.db6228",
+    "id": "90827cac.7f3cc8",
     "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": 2395,
-    "y": 130,
-    "z": "f8944603.71553",
+    "x": 2387.566665649414,
+    "y": 141,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "a669b945.663408",
+    "id": "e557ce2.09f823",
     "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": 2329,
-    "y": 166,
-    "z": "f8944603.71553",
+    "x": 2321.566665649414,
+    "y": 177,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "ba20200a.599368",
+    "id": "47435c42.bdd92c",
     "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": 2514,
-    "y": 93,
-    "z": "f8944603.71553",
+    "x": 2506.566665649414,
+    "y": 104,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f5cafc97.3be338",
+    "id": "b6d8895e.58d1b",
     "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": 4264,
-    "y": 5854,
-    "z": "f8944603.71553",
+    "x": 4256.566665649414,
+    "y": 5865,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "433677c1.52ee48",
+    "id": "c1456abb.063048",
     "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": 4397,
-    "y": 5902,
-    "z": "f8944603.71553",
+    "x": 4389.566665649414,
+    "y": 5913,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "fabf4cab.b217e",
+    "id": "da4c1b48.fae9f8",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4216,
-    "y": 5960,
-    "z": "f8944603.71553",
+    "x": 4208.566665649414,
+    "y": 5971,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d58843e6.45b67",
-        "5480ce12.618198"
+        "86ae7c06.4b48",
+        "7bcdf21f.be49d4"
       ]
     ]
   },
   {
-    "id": "d58843e6.45b67",
+    "id": "86ae7c06.4b48",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409,
-    "y": 5961,
-    "z": "f8944603.71553",
+    "x": 4401.566665649414,
+    "y": 5972,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3584d606.ea3b92"
+        "97f7b4f.de4c2c8"
       ]
     ]
   },
   {
-    "id": "3584d606.ea3b92",
+    "id": "97f7b4f.de4c2c8",
     "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": 4565,
-    "y": 5958,
-    "z": "f8944603.71553",
+    "x": 4557.566665649414,
+    "y": 5969,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5480ce12.618198",
+    "id": "7bcdf21f.be49d4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4413,
-    "y": 6005,
-    "z": "f8944603.71553",
+    "x": 4405.566665649414,
+    "y": 6016,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2c5800b.fe6138"
+        "c9f63d74.2677a"
       ]
     ]
   },
   {
-    "id": "2c5800b.fe6138",
+    "id": "c9f63d74.2677a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4552,
-    "y": 6000,
-    "z": "f8944603.71553",
+    "x": 4544.566665649414,
+    "y": 6011,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cdbca407.a3714",
-        "908326bd.db0de8",
-        "252b791f.9db75e",
-        "275b22ee.4a806e",
-        "331c47e0.bff598",
-        "cf9d9601.e8d088",
-        "b92b2881.bc3e18",
-        "19e51740.b8f8a1",
-        "2ded21f8.219046",
-        "a0a762d0.469c28",
-        "60c16c76.a98d34",
-        "8396080f.a7f6c8"
+        "edf4200a.b4f218",
+        "684d5c9e.960e44",
+        "fa17bed2.102338",
+        "4394fc56.b0a524",
+        "c58358a8.9796d8",
+        "f1d05d51.ef74a8",
+        "9dd9cb2c.0f6d38",
+        "e3b520b5.76f3e",
+        "1492db48.4787f5",
+        "4433eaac.652284",
+        "5e482e7e.e4be78",
+        "b03c5831.d4c5f"
       ]
     ]
   },
   {
-    "id": "b92b2881.bc3e18",
+    "id": "9dd9cb2c.0f6d38",
     "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": 4749,
-    "y": 6679,
-    "z": "f8944603.71553",
+    "x": 4741.566665649414,
+    "y": 6690,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b068e9a3.d4db4",
-        "b79debc6.f268c",
-        "599f79e1.6940a8"
+        "1b9180c4.9f766f",
+        "3223a99b.bae36e",
+        "f1d0a095.e9e33"
       ]
     ]
   },
   {
-    "id": "b068e9a3.d4db4",
+    "id": "1b9180c4.9f766f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954,
-    "y": 6676,
-    "z": "f8944603.71553",
+    "x": 4946.566665649414,
+    "y": 6687,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "be7eb0d3.672b2"
+        "901d20b6.63b228"
       ]
     ]
   },
   {
-    "id": "b79debc6.f268c",
+    "id": "3223a99b.bae36e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4937.490966796875,
-    "y": 6737.574035644531,
-    "z": "f8944603.71553",
+    "x": 4930.057632446289,
+    "y": 6748.574035644531,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7384abca.e83424"
+        "74136956.3d8c9"
       ]
     ]
   },
   {
-    "id": "599f79e1.6940a8",
+    "id": "f1d0a095.e9e33",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4935,
-    "y": 6781,
-    "z": "f8944603.71553",
+    "x": 4927.566665649414,
+    "y": 6792,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5c72f79d.0cafa"
+        "c0df29cc.8ad0d8"
       ]
     ]
   },
   {
-    "id": "be7eb0d3.672b2",
+    "id": "901d20b6.63b228",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5110,
-    "y": 6690,
-    "z": "f8944603.71553",
+    "x": 5102.566665649414,
+    "y": 6701,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "477f7936.afbf38"
+        "1ef77bcc.af8c2c"
       ]
     ]
   },
   {
-    "id": "7384abca.e83424",
+    "id": "74136956.3d8c9",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5100.0623779296875,
-    "y": 6737.859771728516,
-    "z": "f8944603.71553",
+    "x": 5092.629043579102,
+    "y": 6748.859771728516,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5c72f79d.0cafa",
+    "id": "c0df29cc.8ad0d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5102,
-    "y": 6780,
-    "z": "f8944603.71553",
+    "x": 5094.566665649414,
+    "y": 6791,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "477f7936.afbf38",
+    "id": "1ef77bcc.af8c2c",
     "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": 5357,
-    "y": 6687,
-    "z": "f8944603.71553",
+    "x": 5349.566665649414,
+    "y": 6698,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8d0d8dd8.5dff18"
+        "77c4c783.c3eb4"
       ]
     ]
   },
   {
-    "id": "8d0d8dd8.5dff18",
+    "id": "77c4c783.c3eb4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5594,
-    "y": 6683,
-    "z": "f8944603.71553",
+    "x": 5586.566665649414,
+    "y": 6694,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "234239f1.092ec6"
+        "aa349c90.ef423"
       ]
     ]
   },
   {
-    "id": "af0f93b9.f63018",
+    "id": "41bd4d7e.8e8f9c",
     "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": 5837,
-    "y": 6655,
-    "z": "f8944603.71553",
+    "x": 5829.566665649414,
+    "y": 6666,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1906307e.4f6708",
-        "7e26fbb1.9c733c"
+        "858dc053.37b33",
+        "5e74f51.5b7928c"
       ]
     ]
   },
   {
-    "id": "1906307e.4f6708",
+    "id": "858dc053.37b33",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6042,
-    "y": 6675,
-    "z": "f8944603.71553",
+    "x": 6034.566665649414,
+    "y": 6686,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "234239f1.092ec6"
+        "aa349c90.ef423"
       ]
     ]
   },
   {
-    "id": "7e26fbb1.9c733c",
+    "id": "5e74f51.5b7928c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6041,
-    "y": 6628,
-    "z": "f8944603.71553",
+    "x": 6033.566665649414,
+    "y": 6639,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "234239f1.092ec6",
+    "id": "aa349c90.ef423",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785,
-    "y": 6950,
-    "z": "f8944603.71553",
+    "x": 4777.566665649414,
+    "y": 6961,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9c243a63.6beae8"
+        "b674f90b.943ea8"
       ]
     ]
   },
   {
-    "id": "7d275a16.b90c94",
+    "id": "4b6f312b.4e491",
     "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": 6246.999969482422,
-    "y": 6887.999969482422,
-    "z": "f8944603.71553",
+    "x": 6239.566635131836,
+    "y": 6898.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "62c83b20.7bb344",
+    "id": "e9dae4fe.64e148",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4847,
-    "y": 6626,
-    "z": "f8944603.71553",
+    "x": 4839.566665649414,
+    "y": 6637,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cf9d9601.e8d088",
+    "id": "f1d05d51.ef74a8",
     "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": 4729,
-    "y": 6514,
-    "z": "f8944603.71553",
+    "x": 4721.566665649414,
+    "y": 6525,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fb325d12.16a73",
+    "id": "87a0032d.5441b8",
     "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": 5074,
-    "y": 6345,
-    "z": "f8944603.71553",
+    "x": 5066.566665649414,
+    "y": 6356,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2ae3447b.0a1c44"
+        "e7a622d1.3aac3"
       ]
     ]
   },
   {
-    "id": "2ae3447b.0a1c44",
+    "id": "e7a622d1.3aac3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5294,
-    "y": 6351,
-    "z": "f8944603.71553",
+    "x": 5286.566665649414,
+    "y": 6362,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "47fb23b1.c734fc"
+        "d7851175.526278"
       ]
     ]
   },
   {
-    "id": "47fb23b1.c734fc",
+    "id": "d7851175.526278",
     "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": 5481,
-    "y": 6311,
-    "z": "f8944603.71553",
+    "x": 5473.566665649414,
+    "y": 6322,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "504a47cd.0300d8"
+        "56e3e30c.886de4"
       ]
     ]
   },
   {
-    "id": "504a47cd.0300d8",
+    "id": "56e3e30c.886de4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5673,
-    "y": 6314,
-    "z": "f8944603.71553",
+    "x": 5665.566665649414,
+    "y": 6325,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "70b7cd06.f487e4"
+        "c0a5fdcc.0dad4"
       ]
     ]
   },
   {
-    "id": "70b7cd06.f487e4",
+    "id": "c0a5fdcc.0dad4",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5882,
-    "y": 6312,
-    "z": "f8944603.71553",
+    "x": 5874.566665649414,
+    "y": 6323,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "19e51740.b8f8a1",
+    "id": "e3b520b5.76f3e",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4781,
-    "y": 6339,
-    "z": "f8944603.71553",
+    "x": 4773.566665649414,
+    "y": 6350,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fb325d12.16a73"
+        "87a0032d.5441b8"
       ]
     ]
   },
   {
-    "id": "252b791f.9db75e",
+    "id": "fa17bed2.102338",
     "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": 4789,
-    "y": 6232,
-    "z": "f8944603.71553",
+    "x": 4781.566665649414,
+    "y": 6243,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ab2e0e9b.e6e2a",
-        "175d6a26.e8f2ae",
-        "30472c6d.7bfeec"
+        "b854c35b.ab4dd8",
+        "6917c22f.3449c4",
+        "56393d6a.f28b34"
       ]
     ]
   },
   {
-    "id": "ab2e0e9b.e6e2a",
+    "id": "b854c35b.ab4dd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5025,
-    "y": 6215,
-    "z": "f8944603.71553",
+    "x": 5017.566665649414,
+    "y": 6226,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "175d6a26.e8f2ae",
+    "id": "6917c22f.3449c4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5022,
-    "y": 6256,
-    "z": "f8944603.71553",
+    "x": 5014.566665649414,
+    "y": 6267,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "30472c6d.7bfeec",
+    "id": "56393d6a.f28b34",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5036,
-    "y": 6296,
-    "z": "f8944603.71553",
+    "x": 5028.566665649414,
+    "y": 6307,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "275b22ee.4a806e",
+    "id": "4394fc56.b0a524",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4725,
-    "y": 6391,
-    "z": "f8944603.71553",
+    "x": 4717.566665649414,
+    "y": 6402,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "331c47e0.bff598",
+    "id": "c58358a8.9796d8",
     "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": 4733,
-    "y": 6449,
-    "z": "f8944603.71553",
+    "x": 4725.566665649414,
+    "y": 6460,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "908326bd.db0de8",
+    "id": "684d5c9e.960e44",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4738,
-    "y": 6189,
-    "z": "f8944603.71553",
+    "x": 4730.566665649414,
+    "y": 6200,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "8ef1afe7.71ad38",
+    "id": "4f9189d2.f34a8",
     "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": 4853,
-    "y": 6141,
-    "z": "f8944603.71553",
+    "x": 4845.566665649414,
+    "y": 6152,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9c243a63.6beae8",
+    "id": "b674f90b.943ea8",
     "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": 5028,
-    "y": 6947,
-    "z": "f8944603.71553",
+    "x": 5020.566665649414,
+    "y": 6958,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "14533561.0c5673",
-        "af779ea0.7fb81"
+        "f695cd31.082f9",
+        "a92f49c6.640148"
       ]
     ]
   },
   {
-    "id": "14533561.0c5673",
+    "id": "f695cd31.082f9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5257,
-    "y": 6924,
-    "z": "f8944603.71553",
+    "x": 5249.566665649414,
+    "y": 6935,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "55635f65.d76ee8"
+        "fe65cd53.d11278"
       ]
     ]
   },
   {
-    "id": "af779ea0.7fb81",
+    "id": "a92f49c6.640148",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5257,
-    "y": 6973,
-    "z": "f8944603.71553",
+    "x": 5249.566665649414,
+    "y": 6984,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "494eed0f.99eb84",
+    "id": "8c69c55b.110248",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5989.999969482422,
-    "y": 6978.999969482422,
-    "z": "f8944603.71553",
+    "x": 5982.566635131836,
+    "y": 6989.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6ed262af.6482c4",
-        "7d275a16.b90c94",
-        "ea085aad.03ece"
+        "aeda0706.1d102",
+        "4b6f312b.4e491",
+        "eebb4557.9c03c"
       ]
     ]
   },
   {
-    "id": "eb8bdae2.80aaf8",
+    "id": "ca7dd8b0.fcddf",
     "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": 6374.999969482422,
-    "y": 6941.999969482422,
-    "z": "f8944603.71553",
+    "x": 6367.566635131836,
+    "y": 6952.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "ea085aad.03ece",
+    "id": "eebb4557.9c03c",
     "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": 6344.999969482422,
-    "y": 7001.999969482422,
-    "z": "f8944603.71553",
+    "x": 6337.566635131836,
+    "y": 7012.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "6ed262af.6482c4",
+    "id": "aeda0706.1d102",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 6251.999969482422,
-    "y": 6829.999969482422,
-    "z": "f8944603.71553",
+    "x": 6244.566635131836,
+    "y": 6840.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b05d129.ef1b1f",
+    "id": "6c4c0ada.7452e4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3988,
-    "y": 5887,
-    "z": "f8944603.71553",
+    "x": 3980.566665649414,
+    "y": 5898,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "99207b39.65e8d8",
-        "f5cafc97.3be338",
-        "433677c1.52ee48",
-        "fabf4cab.b217e",
-        "7e1b41de.44cf5"
+        "5829dcc0.7722b4",
+        "b6d8895e.58d1b",
+        "c1456abb.063048",
+        "da4c1b48.fae9f8",
+        "778aa80b.aa4e1"
       ]
     ]
   },
   {
-    "id": "e2f1cfff.a8b258",
+    "id": "146e3d98.17031a",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4730,
-    "y": 6289,
-    "z": "f8944603.71553",
+    "x": 4722.566665649414,
+    "y": 6300,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "2ded21f8.219046",
+    "id": "1492db48.4787f5",
     "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": 4858,
-    "y": 6031,
-    "z": "f8944603.71553",
+    "x": 4850.566665649414,
+    "y": 6042,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a18264c.6d9e",
+    "id": "cc643bc5.4660a",
     "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": 4995,
-    "y": 5981,
-    "z": "f8944603.71553",
+    "x": 4987.566665649414,
+    "y": 5992,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "124ab46d.2d752c",
+    "id": "eb6eb29c.21a438",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3822,
-    "y": 3374,
-    "z": "f8944603.71553",
+    "x": 3814.566665649414,
+    "y": 3385,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "826efc02.44c7b",
+    "id": "3ddb9817.a2345",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3999.999969482422,
-    "y": 1608.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3992.566635131836,
+    "y": 1619.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3746cfac.cfad98",
+    "id": "87712f4d.617c48",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3978.9999389648438,
-    "y": 2120.9999389648438,
-    "z": "f8944603.71553",
+    "x": 3971.566604614258,
+    "y": 2131.9999389648438,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b5ea3d16.fd41f",
+    "id": "4a9500be.eb8d5",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3814,
-    "y": 3995,
-    "z": "f8944603.71553",
+    "x": 3806.566665649414,
+    "y": 4006,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9d7f2116.baeda",
+    "id": "1cb779c6.3641ce",
     "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": 3904,
-    "y": 6375,
-    "z": "f8944603.71553",
+    "x": 3896.566665649414,
+    "y": 6386,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2a7dc4a.68ede",
+    "id": "316110e0.e54cc",
     "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": 3706,
-    "y": 4904,
-    "z": "f8944603.71553",
+    "x": 3698.566665649414,
+    "y": 4915,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a789852e.51cd48",
+    "id": "b160de6d.e8ced8",
     "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": 3839,
-    "y": 4952,
-    "z": "f8944603.71553",
+    "x": 3831.566665649414,
+    "y": 4963,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "23762b83.94d65c",
+    "id": "f0982e54.06c37",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4385,
-    "y": 4580,
-    "z": "f8944603.71553",
+    "x": 4377.566665649414,
+    "y": 4591,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e4f34350.306628",
-        "84eda9bb.13e58"
+        "c8f13ad.170ba48",
+        "e5fec2af.744f18"
       ]
     ]
   },
   {
-    "id": "e4f34350.306628",
+    "id": "c8f13ad.170ba48",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4578,
-    "y": 4581,
-    "z": "f8944603.71553",
+    "x": 4570.566665649414,
+    "y": 4592,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d93f9a59.274b5"
+        "7d8426b0.28b2e8"
       ]
     ]
   },
   {
-    "id": "84eda9bb.13e58",
+    "id": "e5fec2af.744f18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4582,
-    "y": 4625,
-    "z": "f8944603.71553",
+    "x": 4574.566665649414,
+    "y": 4636,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fa8add54.9c2898"
+        "bbb62c5.19c455"
       ]
     ]
   },
   {
-    "id": "fa8add54.9c2898",
+    "id": "bbb62c5.19c455",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4721,
-    "y": 4620,
-    "z": "f8944603.71553",
+    "x": 4713.566665649414,
+    "y": 4631,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "48346123.4f10a8",
-        "5e210590.033b4c",
-        "140ccb32.dd72dd"
+        "fdbb486.bd6db38",
+        "ecce0ba1.70791",
+        "5cdec210.c3723c"
       ]
     ]
   },
   {
-    "id": "d93f9a59.274b5",
+    "id": "7d8426b0.28b2e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4721,
-    "y": 4577,
-    "z": "f8944603.71553",
+    "x": 4713.566665649414,
+    "y": 4588,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a4406b4c.17bbc",
-        "18ca4a3.634f536",
-        "b4f57662.21d798",
-        "540d81b.ac8608"
+        "5a0b429f.b8f42c",
+        "5930a956.25a2b",
+        "8f7ba394.827068",
+        "4161f07f.2b4a78"
       ]
     ]
   },
   {
-    "id": "48346123.4f10a8",
+    "id": "fdbb486.bd6db38",
     "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": 5123.000244140625,
-    "y": 4842,
-    "z": "f8944603.71553",
+    "x": 5115.566909790039,
+    "y": 4853,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "54a11c60.7fd1ec",
+    "id": "1b42c685.843199",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5130.000244140625,
-    "y": 4796,
-    "z": "f8944603.71553",
+    "x": 5122.566909790039,
+    "y": 4807,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a0a762d0.469c28",
+    "id": "4433eaac.652284",
     "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": 4920,
-    "y": 6575,
-    "z": "f8944603.71553",
+    "x": 4912.566665649414,
+    "y": 6586,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e210590.033b4c",
+    "id": "ecce0ba1.70791",
     "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": 5241.000244140625,
-    "y": 4884,
-    "z": "f8944603.71553",
+    "x": 5233.566909790039,
+    "y": 4895,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "259aff1b.d97a1",
+    "id": "31466e0d.9a3dba",
     "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": 5116,
-    "y": 5142,
-    "z": "f8944603.71553",
+    "x": 5108.566665649414,
+    "y": 5153,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "80314ddc.393748",
+    "id": "c7cb9f6d.ac734",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3461,
-    "y": 4475,
-    "z": "f8944603.71553",
+    "x": 3453.566665649414,
+    "y": 4486,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d1326c21.abc33",
+    "id": "9ba8b5cc.a415f",
     "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": 3983,
-    "y": 4576,
-    "z": "f8944603.71553",
+    "x": 3975.566665649414,
+    "y": 4587,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "434bd8c2.bae4f8",
+    "id": "595e7f4b.3b8bd8",
     "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": 3440,
-    "y": 4519,
-    "z": "f8944603.71553",
+    "x": 3432.566665649414,
+    "y": 4530,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7ea7dff4.93abc",
-        "616c8d40.285e14",
-        "ffe0a536.7eaff8"
+        "2a6568f7.a02838",
+        "9843c265.208d4",
+        "db80e493.f550d"
       ]
     ]
   },
   {
-    "id": "616c8d40.285e14",
+    "id": "9843c265.208d4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3628.490966796875,
-    "y": 4487.57421875,
-    "z": "f8944603.71553",
+    "x": 3621.057632446289,
+    "y": 4498.57421875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "739b53.f4a4fcac"
+        "d1fd8036.140ed8"
       ]
     ]
   },
   {
-    "id": "ffe0a536.7eaff8",
+    "id": "db80e493.f550d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617,
-    "y": 4527,
-    "z": "f8944603.71553",
+    "x": 3609.566665649414,
+    "y": 4538,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "68d1064e.ebb3b8"
+        "b0bc7666.9d27d8"
       ]
     ]
   },
   {
-    "id": "739b53.f4a4fcac",
+    "id": "d1fd8036.140ed8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3788.0625,
-    "y": 4485.85986328125,
-    "z": "f8944603.71553",
+    "x": 3780.629165649414,
+    "y": 4496.85986328125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "68d1064e.ebb3b8",
+    "id": "b0bc7666.9d27d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3778,
-    "y": 4528,
-    "z": "f8944603.71553",
+    "x": 3770.566665649414,
+    "y": 4539,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "aedbd8f5.94f11",
+    "id": "aa03472e.31d4e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3780,
-    "y": 4572,
-    "z": "f8944603.71553",
+    "x": 3772.566665649414,
+    "y": 4583,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "530f885c.d5a28",
-        "d1326c21.abc33"
+        "4ba9a34f.8b45e4",
+        "9ba8b5cc.a415f"
       ]
     ]
   },
   {
-    "id": "7ea7dff4.93abc",
+    "id": "2a6568f7.a02838",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3622,
-    "y": 4564,
-    "z": "f8944603.71553",
+    "x": 3614.566665649414,
+    "y": 4575,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "aedbd8f5.94f11"
+        "aa03472e.31d4e8"
       ]
     ]
   },
   {
-    "id": "530f885c.d5a28",
+    "id": "4ba9a34f.8b45e4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3941,
-    "y": 4504,
-    "z": "f8944603.71553",
+    "x": 3933.566665649414,
+    "y": 4515,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cd1fc06c.124968",
+    "id": "8bf8bc6f.53ce6",
     "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": 3806,
-    "y": 4843,
-    "z": "f8944603.71553",
+    "x": 3798.566665649414,
+    "y": 4854,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac8fc812.ca8b88",
+    "id": "d58a2a07.e32878",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5920.88330078125,
-    "y": 6592.88330078125,
-    "z": "f8944603.71553",
+    "x": 5913.449966430664,
+    "y": 6603.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "140ccb32.dd72dd",
+    "id": "5cdec210.c3723c",
     "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": 5120.667236328125,
-    "y": 4980.08349609375,
-    "z": "f8944603.71553",
+    "x": 5113.233901977539,
+    "y": 4991.08349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "60fccea7.c83a28",
+    "id": "7d691c73.0a445c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5122.884033203125,
-    "y": 4939.88330078125,
-    "z": "f8944603.71553",
+    "x": 5115.450698852539,
+    "y": 4950.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b61f1c95.4694d",
+    "id": "19c788e0.a62557",
     "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": 4996.6669921875,
-    "y": 5230.08349609375,
-    "z": "f8944603.71553",
+    "x": 4989.233657836914,
+    "y": 5241.08349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "82a40a13.767da8",
+    "id": "b53673c2.40ae68",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4998.8837890625,
-    "y": 5189.88330078125,
-    "z": "f8944603.71553",
+    "x": 4991.450454711914,
+    "y": 5200.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "91bd4596.74f628",
+    "id": "cb99e55a.09312",
     "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": 5086.466796875,
-    "y": 5592.5166015625,
-    "z": "f8944603.71553",
+    "x": 5079.033462524414,
+    "y": 5603.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f50c2a2e.93dfe8",
+    "id": "b6bbe449.e349b8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4913.466796875,
-    "y": 5649.5166015625,
-    "z": "f8944603.71553",
+    "x": 4906.033462524414,
+    "y": 5660.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8646fa93.554c38",
-        "a6ded94a.e3e54"
+        "9f020db8.9d3b98",
+        "42fb1006.cd98b"
       ]
     ]
   },
   {
-    "id": "8646fa93.554c38",
+    "id": "9f020db8.9d3b98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5124.466796875,
-    "y": 5649.5166015625,
-    "z": "f8944603.71553",
+    "x": 5117.033462524414,
+    "y": 5660.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "258b63bd.85fb7c"
+        "406d3b53.ee3654"
       ]
     ]
   },
   {
-    "id": "a6ded94a.e3e54",
+    "id": "42fb1006.cd98b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5120.466796875,
-    "y": 5697.5166015625,
-    "z": "f8944603.71553",
+    "x": 5113.033462524414,
+    "y": 5708.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d925f9fa.8153b8"
+        "fa70895e.520cf8"
       ]
     ]
   },
   {
-    "id": "258b63bd.85fb7c",
+    "id": "406d3b53.ee3654",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5280.466796875,
-    "y": 5645.5166015625,
-    "z": "f8944603.71553",
+    "x": 5273.033462524414,
+    "y": 5656.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8d6cf51e.6059f8",
-        "44488697.cdb02",
-        "c9ce352b.46ce88"
+        "8249d2ac.0a73f8",
+        "2838a041.93c678",
+        "45d14641.c6458"
       ]
     ]
   },
   {
-    "id": "d925f9fa.8153b8",
+    "id": "fa70895e.520cf8",
     "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": 5268.466796875,
-    "y": 5692.5166015625,
-    "z": "f8944603.71553",
+    "x": 5261.033462524414,
+    "y": 5703.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "df7464c9.77f0d",
+    "id": "f332f23.f01a81",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5590.3505859375,
-    "y": 5746.39990234375,
-    "z": "f8944603.71553",
+    "x": 5582.917251586914,
+    "y": 5757.39990234375,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c9ce352b.46ce88",
+    "id": "45d14641.c6458",
     "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": 5594.1337890625,
-    "y": 5784.60009765625,
-    "z": "f8944603.71553",
+    "x": 5586.700454711914,
+    "y": 5795.60009765625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "44488697.cdb02",
+    "id": "2838a041.93c678",
     "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": 5700.466796875,
-    "y": 5697.5166015625,
-    "z": "f8944603.71553",
+    "x": 5693.033462524414,
+    "y": 5708.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d6cf51e.6059f8",
+    "id": "8249d2ac.0a73f8",
     "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": 5584.466796875,
-    "y": 5645.5166015625,
-    "z": "f8944603.71553",
+    "x": 5577.033462524414,
+    "y": 5656.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7e224339.ebcda4",
+    "id": "3aa78165.d5c51e",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4975.466796875,
-    "y": 5550.5166015625,
-    "z": "f8944603.71553",
+    "x": 4968.033462524414,
+    "y": 5561.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "60c16c76.a98d34",
+    "id": "5e482e7e.e4be78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4687.7998046875,
-    "y": 5725.5166015625,
-    "z": "f8944603.71553",
+    "x": 4680.366470336914,
+    "y": 5736.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "91bd4596.74f628",
-        "f50c2a2e.93dfe8",
-        "b08c7802.5d204",
-        "7492e58a.da53dc"
+        "cb99e55a.09312",
+        "b6bbe449.e349b8",
+        "5021b590.5d75e4",
+        "316a2790.87ce5"
       ]
     ]
   },
   {
-    "id": "8396080f.a7f6c8",
+    "id": "b03c5831.d4c5f",
     "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": 4987.8330078125,
-    "y": 6086.2001953125,
-    "z": "f8944603.71553",
+    "x": 4980.399673461914,
+    "y": 6097.2001953125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "e07ba4bc.bfaae8",
+    "id": "b60a5a20.1568d",
     "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": 5794.116668701172,
-    "y": 6923.116668701172,
-    "z": "f8944603.71553",
+    "x": 5786.683334350586,
+    "y": 6934.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "55635f65.d76ee8",
+    "id": "fe65cd53.d11278",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5413.116668701172,
-    "y": 6926.116668701172,
-    "z": "f8944603.71553",
+    "x": 5405.683334350586,
+    "y": 6937.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e07ba4bc.bfaae8",
-        "d0282e45.27576",
-        "be279863.754a6"
+        "b60a5a20.1568d",
+        "364f2ed4.be66d2",
+        "3daa885e.628288"
       ]
     ]
   },
   {
-    "id": "d0282e45.27576",
+    "id": "364f2ed4.be66d2",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5639.116668701172,
-    "y": 6978.116668701172,
-    "z": "f8944603.71553",
+    "x": 5631.683334350586,
+    "y": 6989.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "adb0d898.09cba8"
+        "1f12c870.4650c"
       ]
     ]
   },
   {
-    "id": "adb0d898.09cba8",
+    "id": "1f12c870.4650c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5818.116668701172,
-    "y": 6977.116668701172,
-    "z": "f8944603.71553",
+    "x": 5810.683334350586,
+    "y": 6988.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "494eed0f.99eb84"
+        "8c69c55b.110248"
       ]
     ]
   },
   {
-    "id": "be279863.754a6",
+    "id": "3daa885e.628288",
     "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": 5640.116668701172,
-    "y": 6871.116668701172,
-    "z": "f8944603.71553",
+    "x": 5632.683334350586,
+    "y": 6882.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3cd9264c.3cdbea",
+    "id": "651f3c1e.ddf684",
     "type": "notify",
     "name": "notify",
     "xml": "<notify plugin='' resource='' action='' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2634.116668701172,
-    "y": 920.1166687011719,
-    "z": "f8944603.71553",
+    "x": 2626.683334350586,
+    "y": 931.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "d4db1de6.243c9",
+    "id": "f71bee39.3d2f68",
     "type": "set",
     "name": "set network-route-three",
     "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
     "comments": "",
-    "x": 3312.116668701172,
-    "y": 696.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3304.683334350586,
+    "y": 707.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b2eea3d4.d83b2",
+    "id": "1f090c0d.f20bac",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3528.116668701172,
-    "y": 1024.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3520.683334350586,
+    "y": 1035.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c92a9c74.6d8cb",
+    "id": "4c96009f.d63af8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3523.625732421875,
-    "y": 1066.542724609375,
-    "z": "f8944603.71553",
+    "x": 3516.192398071289,
+    "y": 1077.542724609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "be6d3c2.c1bdfc",
+    "id": "30702b44.ca2744",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3527.625701904297,
-    "y": 1114.5426940917969,
-    "z": "f8944603.71553",
+    "x": 3520.192367553711,
+    "y": 1125.5426940917969,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "82044de7.824378"
+        "f0fe90c1.1ee158"
       ]
     ]
   },
   {
-    "id": "82044de7.824378",
+    "id": "f0fe90c1.1ee158",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3685.116668701172,
-    "y": 1114.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3677.683334350586,
+    "y": 1125.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9732d3c5.76e0c8"
+        "24f554c8.25b494"
       ]
     ]
   },
   {
-    "id": "9732d3c5.76e0c8",
+    "id": "24f554c8.25b494",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3855.11669921875,
-    "y": 1117.1168212890625,
-    "z": "f8944603.71553",
+    "x": 3847.683364868164,
+    "y": 1128.1168212890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7d1d73b.5c3fc8c",
-        "8cd6f95a.d7c4d",
-        "68098f91.a64618"
+        "92b753af.8b83b",
+        "e0d04b94.0a949",
+        "3f783acd.f1212e"
       ]
     ]
   },
   {
-    "id": "7d1d73b.5c3fc8c",
+    "id": "92b753af.8b83b",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4029.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4021.683334350586,
+    "y": 1066.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a9479bec.894888"
+        "34be9217.24bb7e"
       ]
     ]
   },
   {
-    "id": "8cd6f95a.d7c4d",
+    "id": "e0d04b94.0a949",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4031.116668701172,
-    "y": 1109.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4023.683334350586,
+    "y": 1120.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d844935e.741748"
+        "1a5ec0d1.1d1527"
       ]
     ]
   },
   {
-    "id": "a9479bec.894888",
+    "id": "34be9217.24bb7e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4157.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4149.683334350586,
+    "y": 1066.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7a232bae.539a2c",
-        "19f7263a.0f2e72"
+        "c2e9a46e.2fa128",
+        "d3171aa3.cb0078"
       ]
     ]
   },
   {
-    "id": "d844935e.741748",
+    "id": "1a5ec0d1.1d1527",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4160.116668701172,
-    "y": 1108.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4152.683334350586,
+    "y": 1119.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e31191f4.c7e44",
-        "c783c2e3.52d62"
+        "1fb8ea51.9b1c8e",
+        "b9df456c.24fc38"
       ]
     ]
   },
   {
-    "id": "19f7263a.0f2e72",
+    "id": "d3171aa3.cb0078",
     "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": 4318.116668701172,
-    "y": 1079.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4310.683334350586,
+    "y": 1090.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "e31191f4.c7e44",
+    "id": "1fb8ea51.9b1c8e",
     "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": 4335.116668701172,
-    "y": 1121.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4327.683334350586,
+    "y": 1132.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c783c2e3.52d62",
+    "id": "b9df456c.24fc38",
     "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": 4320.116668701172,
-    "y": 1159.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4312.683334350586,
+    "y": 1170.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7a232bae.539a2c",
+    "id": "c2e9a46e.2fa128",
     "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": 4332.116668701172,
-    "y": 1039.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4324.683334350586,
+    "y": 1050.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5dbb2ad5.55ee04",
+    "id": "dc69c361.915968",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4497.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4489.683334350586,
+    "y": 1066.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "4c9f1a43.e137e4",
+    "id": "6cb3b80a.d81b1",
     "type": "save",
     "name": "get network-route-three from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
     "comments": "",
     "outputs": 1,
-    "x": 3288.116668701172,
-    "y": 1041.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3280.683334350586,
+    "y": 1052.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b2eea3d4.d83b2",
-        "c92a9c74.6d8cb",
-        "be6d3c2.c1bdfc"
+        "1f090c0d.f20bac",
+        "4c96009f.d63af8",
+        "30702b44.ca2744"
       ]
     ]
   },
   {
-    "id": "68098f91.a64618",
+    "id": "3f783acd.f1212e",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3974.116668701172,
-    "y": 1173.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3966.683334350586,
+    "y": 1184.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3baeb12d.78947e"
+        "ce69203c.a7c0d"
       ]
     ]
   },
   {
-    "id": "3baeb12d.78947e",
+    "id": "ce69203c.a7c0d",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4148.116668701172,
-    "y": 1168.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4140.683334350586,
+    "y": 1179.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f32a06d7.18ee6",
-        "9c8c5f6f.4f4828"
+        "77a19b24.92e3d4",
+        "6c3b4ea8.3b622"
       ]
     ]
   },
   {
-    "id": "9c8c5f6f.4f4828",
+    "id": "6c3b4ea8.3b622",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4318.116668701172,
-    "y": 1241.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4310.683334350586,
+    "y": 1252.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f32a06d7.18ee6",
+    "id": "77a19b24.92e3d4",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4372.116668701172,
-    "y": 1201.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4364.683334350586,
+    "y": 1212.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "89b3411b.fe2cb",
+    "id": "a7c6adcc.5c3908",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4486.116668701172,
-    "y": 1226.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4478.683334350586,
+    "y": 1237.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fe4b773c.0eae98",
+    "id": "cb966d3f.bcf358",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.116668701172,
-    "y": 929.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4037.683334350586,
+    "y": 940.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a6d4107d.6655f"
+        "359af935.19ef46"
       ]
     ]
   },
   {
-    "id": "e8ae3a08.56b988",
+    "id": "ca572ac1.2b94f8",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4389.116668701172,
-    "y": 997.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4381.683334350586,
+    "y": 1008.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "8ecb2104.b1fc58",
+    "id": "60fff9bd.2ccfe",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4443.116668701172,
-    "y": 957.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4435.683334350586,
+    "y": 968.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a817660e.e9d2",
+    "id": "74e2fab5.3910b4",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4587.116668701172,
-    "y": 986.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4579.683334350586,
+    "y": 997.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a6d4107d.6655f",
+    "id": "359af935.19ef46",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4219.116668701172,
-    "y": 924.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4211.683334350586,
+    "y": 935.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8ecb2104.b1fc58",
-        "e8ae3a08.56b988"
+        "60fff9bd.2ccfe",
+        "ca572ac1.2b94f8"
       ]
     ]
   },
   {
-    "id": "83ce05e.7f315f8",
+    "id": "dd62b4eb.26fb1",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4105.116668701172,
-    "y": 667.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4097.683334350586,
+    "y": 678.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d03cb873.c57328"
+        "eaab099.c2c5e78"
       ]
     ]
   },
   {
-    "id": "2049e56d.3172ca",
+    "id": "44f31aac.78bf4c",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4449.116668701172,
-    "y": 735.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4441.683334350586,
+    "y": 746.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6995e48e.171b9c",
+    "id": "e00b5614.1b212",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4503.116668701172,
-    "y": 695.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4495.683334350586,
+    "y": 706.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "80fe4b30.9273d",
+    "id": "fb8145.224d2eb8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4617.116668701172,
-    "y": 720.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4609.683334350586,
+    "y": 731.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d03cb873.c57328",
+    "id": "eaab099.c2c5e78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4279.116668701172,
-    "y": 662.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4271.683334350586,
+    "y": 673.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6995e48e.171b9c",
-        "2049e56d.3172ca"
+        "e00b5614.1b212",
+        "44f31aac.78bf4c"
       ]
     ]
   },
   {
-    "id": "d8eb368d.7e35e8",
+    "id": "47b6d6c0.771098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3686.116668701172,
-    "y": 2544.116668701172,
-    "z": "f8944603.71553",
+    "x": 3678.683334350586,
+    "y": 2555.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9d31c4f.62b63b8",
-        "42d540.6e2552c"
+        "d5c762a3.e1b22",
+        "cd80f814.c17fb8"
       ]
     ]
   },
   {
-    "id": "4acebe87.51a2e",
+    "id": "6a53c92c.c39ad8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3513.450164794922,
-    "y": 2545.116668701172,
-    "z": "f8944603.71553",
+    "x": 3506.016830444336,
+    "y": 2556.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d8eb368d.7e35e8"
+        "47b6d6c0.771098"
       ]
     ]
   },
   {
-    "id": "faf79ca9.39c718",
+    "id": "15ee64d.915489b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3522.941131591797,
-    "y": 2587.690704345703,
-    "z": "f8944603.71553",
+    "x": 3515.507797241211,
+    "y": 2598.690704345703,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "760b8826.a76aa",
+    "id": "ffc72b13.54b308",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.450164794922,
-    "y": 2634.116668701172,
-    "z": "f8944603.71553",
+    "x": 3504.016830444336,
+    "y": 2645.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d31c4f.62b63b8",
+    "id": "d5c762a3.e1b22",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3972.450164794922,
-    "y": 2548.1167907714844,
-    "z": "f8944603.71553",
+    "x": 3965.016830444336,
+    "y": 2559.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "beea1414.622ca8",
-        "e0900c85.f5153"
+        "39f97b3f.483dec",
+        "a10b377c.8904d8"
       ]
     ]
   },
   {
-    "id": "e0900c85.f5153",
+    "id": "a10b377c.8904d8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4195.450164794922,
-    "y": 2503.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4188.016830444336,
+    "y": 2514.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b1fce547.cdefa8"
+        "1c79745.54c4b0c"
       ]
     ]
   },
   {
-    "id": "beea1414.622ca8",
+    "id": "39f97b3f.483dec",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4197.450164794922,
-    "y": 2567.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4190.016830444336,
+    "y": 2578.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1f2077c9.d2f12"
+        "5e26eb53.994624"
       ]
     ]
   },
   {
-    "id": "1931dff5.72d728",
+    "id": "59ced5c4.1cbb54",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3285.450164794922,
-    "y": 2580.116668701172,
-    "z": "f8944603.71553",
+    "x": 3278.016830444336,
+    "y": 2591.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4acebe87.51a2e",
-        "faf79ca9.39c718",
-        "760b8826.a76aa"
+        "6a53c92c.c39ad8",
+        "15ee64d.915489b",
+        "ffc72b13.54b308"
       ]
     ]
   },
   {
-    "id": "20a2805c.f7ce68",
+    "id": "bf53a639.73b6d8",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3246.450164794922,
-    "y": 2524.116668701172,
-    "z": "f8944603.71553",
+    "x": 3239.016830444336,
+    "y": 2535.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f953800.9cf34",
+    "id": "7411f30.15b1c8c",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3305.450164794922,
-    "y": 2320.116668701172,
-    "z": "f8944603.71553",
+    "x": 3298.016830444336,
+    "y": 2331.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1523d633.28a802",
-        "23587c7d.fbba4c"
+        "dd801267.ae8a78",
+        "2c468159.26cb9e"
       ]
     ]
   },
   {
-    "id": "23587c7d.fbba4c",
+    "id": "2c468159.26cb9e",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3528.450164794922,
-    "y": 2306.116668701172,
-    "z": "f8944603.71553",
+    "x": 3521.016830444336,
+    "y": 2317.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c7b4b7e7.8e8b78"
+        "1f5c2f54.7e50d9"
       ]
     ]
   },
   {
-    "id": "1523d633.28a802",
+    "id": "dd801267.ae8a78",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3530.450164794922,
-    "y": 2339.116668701172,
-    "z": "f8944603.71553",
+    "x": 3523.016830444336,
+    "y": 2350.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7b4b7e7.8e8b78",
+    "id": "1f5c2f54.7e50d9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3676.450164794922,
-    "y": 2299.116668701172,
-    "z": "f8944603.71553",
+    "x": 3669.016830444336,
+    "y": 2310.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cb965cfe.67a2f",
-        "1a7add8d.af97ca"
+        "33d7ee91.be9492",
+        "2cd16653.cccd12"
       ]
     ]
   },
   {
-    "id": "cb965cfe.67a2f",
+    "id": "33d7ee91.be9492",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3870.450164794922,
-    "y": 2302.1167907714844,
-    "z": "f8944603.71553",
+    "x": 3863.016830444336,
+    "y": 2313.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "42d540.6e2552c",
+    "id": "cd80f814.c17fb8",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3923.4501342773438,
-    "y": 2671.1166381835938,
-    "z": "f8944603.71553",
+    "x": 3916.016799926758,
+    "y": 2682.1166381835938,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b84e7511.3844a8"
+        "f197c90a.b0bfd8"
       ]
     ]
   },
   {
-    "id": "b84e7511.3844a8",
+    "id": "f197c90a.b0bfd8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4129.450134277344,
-    "y": 2671.1166381835938,
-    "z": "f8944603.71553",
+    "x": 4122.016799926758,
+    "y": 2682.1166381835938,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ac19c527.29aaf8"
+        "ee87c14f.7e00c8"
       ]
     ]
   },
   {
-    "id": "1a7add8d.af97ca",
+    "id": "2cd16653.cccd12",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3892.450164794922,
-    "y": 2370.1167907714844,
-    "z": "f8944603.71553",
+    "x": 3885.016830444336,
+    "y": 2381.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c6c93f82.1aa228",
-        "f4da497f.0275c8",
-        "6e9758a5.eabec"
+        "b86ed6f1.7f482",
+        "f1a441ce.e5665",
+        "de4f03bc.b1dad"
       ]
     ]
   },
   {
-    "id": "c6c93f82.1aa228",
+    "id": "b86ed6f1.7f482",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4087.9502868652344,
-    "y": 2322.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4080.5169525146484,
+    "y": 2333.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a1f1dc1c.4be4e8"
+        "4728dd3.dc78424"
       ]
     ]
   },
   {
-    "id": "f4da497f.0275c8",
+    "id": "f1a441ce.e5665",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4079.9502868652344,
-    "y": 2377.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4072.5169525146484,
+    "y": 2388.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "dd2530b3.0ce388"
+        "250a014d.a07c5e"
       ]
     ]
   },
   {
-    "id": "6e9758a5.eabec",
+    "id": "de4f03bc.b1dad",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4084.9502868652344,
-    "y": 2434.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4077.5169525146484,
+    "y": 2445.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "35cb1b46.9ab3ac"
+        "c4850afb.039ba"
       ]
     ]
   },
   {
-    "id": "35cb1b46.9ab3ac",
+    "id": "c4850afb.039ba",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4236.950286865234,
-    "y": 2435.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4229.516952514648,
+    "y": 2446.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a1f1dc1c.4be4e8",
+    "id": "4728dd3.dc78424",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4232.332611083984,
-    "y": 2319.7724609375,
-    "z": "f8944603.71553",
+    "x": 4224.899276733398,
+    "y": 2330.7724609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "807e8aa5.b5f288"
+        "f5f74636.92701"
       ]
     ]
   },
   {
-    "id": "be1fed24.75522",
+    "id": "b2338e3d.f752e8",
     "type": "set",
     "name": "set SECONDARY-ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
     "comments": "",
-    "x": 3308.116668701172,
-    "y": 2659.116668701172,
-    "z": "f8944603.71553",
+    "x": 3300.683334350586,
+    "y": 2670.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "89002347.f12fb8",
+    "id": "b3bc28cb.23625",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3983.1166381835938,
-    "y": 2623.1166381835938,
-    "z": "f8944603.71553",
+    "x": 3975.683303833008,
+    "y": 2634.1166381835938,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "1f2077c9.d2f12",
+    "id": "5e26eb53.994624",
     "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": 4356.450164794922,
-    "y": 2586.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4349.016830444336,
+    "y": 2597.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b1fce547.cdefa8",
+    "id": "1c79745.54c4b0c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4360.450164794922,
-    "y": 2500.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4353.016830444336,
+    "y": 2511.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9ddcbad2.3cd968",
-        "a4909c74.16b3c"
+        "fe7cdeb0.daac9",
+        "34c0d4b1.5c7dfc"
       ]
     ]
   },
   {
-    "id": "ac19c527.29aaf8",
+    "id": "ee87c14f.7e00c8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4346.735778808594,
-    "y": 2669.9384155273438,
-    "z": "f8944603.71553",
+    "x": 4339.302444458008,
+    "y": 2680.9384155273438,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "aecc45b1.07799"
+        "fc8a72d4.98e42"
       ]
     ]
   },
   {
-    "id": "dd2530b3.0ce388",
+    "id": "250a014d.a07c5e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4247.950286865234,
-    "y": 2380.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4240.516952514648,
+    "y": 2391.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9ddcbad2.3cd968",
+    "id": "fe7cdeb0.daac9",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
     "comments": "",
-    "x": 4530.450164794922,
-    "y": 2461.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4523.016830444336,
+    "y": 2472.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a4909c74.16b3c",
+    "id": "34c0d4b1.5c7dfc",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
     "comments": "",
-    "x": 4531.450164794922,
-    "y": 2566.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4524.016830444336,
+    "y": 2577.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "90f369e0.1f5ea",
+    "id": "6a8cd207.c1e8c4",
     "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": 4526.450164794922,
-    "y": 2515.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4519.016830444336,
+    "y": 2526.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "aecc45b1.07799",
+    "id": "fc8a72d4.98e42",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4553.567321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4546.133987426758,
+    "y": 2670.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d7d46b6.f157298",
-        "a76ccf28.3b019",
-        "6d38c2ba.e73f94"
+        "8f4cacd5.ce6228",
+        "4e56644.a64779c",
+        "68f649.e92691b8"
       ]
     ]
   },
   {
-    "id": "d7d46b6.f157298",
+    "id": "8f4cacd5.ce6228",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4768.567321777344,
-    "y": 2621.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4761.133987426758,
+    "y": 2632.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a76ccf28.3b019",
+    "id": "4e56644.a64779c",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4765.567321777344,
-    "y": 2660.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4758.133987426758,
+    "y": 2671.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "af66a72d.a68048"
+        "9a6ae8ae.1adf3"
       ]
     ]
   },
   {
-    "id": "6d38c2ba.e73f94",
+    "id": "68f649.e92691b8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4721.067321777344,
-    "y": 2702.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4713.633987426758,
+    "y": 2713.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "56aae750.4bf18",
+    "id": "d8d22b92.e3f9c8",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4814.450164794922,
-    "y": 2338.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4807.016830444336,
+    "y": 2349.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "df2c6ab5.f8c7a"
+        "8d5de697.738fb"
       ]
     ]
   },
   {
-    "id": "807e8aa5.b5f288",
+    "id": "f5f74636.92701",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4416.450164794922,
-    "y": 2334.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4409.016830444336,
+    "y": 2345.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "83815f42.db62e8"
+        "458de584.eb17d4"
       ]
     ]
   },
   {
-    "id": "83815f42.db62e8",
+    "id": "458de584.eb17d4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4611.450164794922,
-    "y": 2334.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4604.016830444336,
+    "y": 2345.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "56aae750.4bf18",
-        "ace3955f.b78118"
+        "d8d22b92.e3f9c8",
+        "aa17b1cc.ebb808"
       ]
     ]
   },
   {
-    "id": "ace3955f.b78118",
+    "id": "aa17b1cc.ebb808",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4816.450164794922,
-    "y": 2411.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4809.016830444336,
+    "y": 2422.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "86fe5017.1c8158"
+        "74ed71f8.f337d8"
       ]
     ]
   },
   {
-    "id": "af66a72d.a68048",
+    "id": "9a6ae8ae.1adf3",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4946.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4938.633987426758,
+    "y": 2670.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "73b98dcb.d53e2c"
+        "48cbb65c.c75f18"
       ]
     ]
   },
   {
-    "id": "73b98dcb.d53e2c",
+    "id": "48cbb65c.c75f18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5104.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 5096.633987426758,
+    "y": 2670.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "35f64a50.ea71a6"
+        "5d1f9a1.a44f9e4"
       ]
     ]
   },
   {
-    "id": "35f64a50.ea71a6",
+    "id": "5d1f9a1.a44f9e4",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5311.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 5303.633987426758,
+    "y": 2670.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "df2c6ab5.f8c7a",
+    "id": "8d5de697.738fb",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4991.450164794922,
-    "y": 2330.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4984.016830444336,
+    "y": 2341.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b41095a1.9dd71",
-        "c294b821.4082d"
+        "557f2b2a.e4488c",
+        "b7eb9cb4.7bd228"
       ]
     ]
   },
   {
-    "id": "c294b821.4082d",
+    "id": "b7eb9cb4.7bd228",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5199.450164794922,
-    "y": 2337.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5192.016830444336,
+    "y": 2348.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cbd53666.7a192",
-        "70f8105c.8c53c8",
-        "d07f4c5c.e57d28"
+        "2cc0f80f.8e664",
+        "e33c4c36.9c6408",
+        "decf6255.02de4"
       ]
     ]
   },
   {
-    "id": "86fe5017.1c8158",
+    "id": "74ed71f8.f337d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4993.450164794922,
-    "y": 2403.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4986.016830444336,
+    "y": 2414.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "29792fa0.312a5"
+        "ddc00f08.8fee3"
       ]
     ]
   },
   {
-    "id": "b41095a1.9dd71",
+    "id": "557f2b2a.e4488c",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainC id",
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5229.450164794922,
-    "y": 2285.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5222.016830444336,
+    "y": 2296.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "29792fa0.312a5",
+    "id": "ddc00f08.8fee3",
     "type": "set",
     "name": "set domainC ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5228.450164794922,
-    "y": 2527.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5221.016830444336,
+    "y": 2538.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cbd53666.7a192",
+    "id": "2cc0f80f.8e664",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5409.450164794922,
-    "y": 2328.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5402.016830444336,
+    "y": 2339.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "12fe1a85.5f5265"
+        "aada8b04.37bbe"
       ]
     ]
   },
   {
-    "id": "70f8105c.8c53c8",
+    "id": "e33c4c36.9c6408",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5401.450164794922,
-    "y": 2383.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5394.016830444336,
+    "y": 2394.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "720591da.7ff908"
+        "52b0fc34.6385e4"
       ]
     ]
   },
   {
-    "id": "d07f4c5c.e57d28",
+    "id": "decf6255.02de4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5406.450164794922,
-    "y": 2440.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5399.016830444336,
+    "y": 2451.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "50fd00db.804e78"
+        "1d0f9aee.0f2085"
       ]
     ]
   },
   {
-    "id": "50fd00db.804e78",
+    "id": "1d0f9aee.0f2085",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5558.450164794922,
-    "y": 2441.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5551.016830444336,
+    "y": 2452.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "720591da.7ff908",
+    "id": "52b0fc34.6385e4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5569.450164794922,
-    "y": 2386.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5562.016830444336,
+    "y": 2397.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "12fe1a85.5f5265",
+    "id": "aada8b04.37bbe",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5553.832489013672,
-    "y": 2325.7724609375,
-    "z": "f8944603.71553",
+    "x": 5546.399154663086,
+    "y": 2336.7724609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d4fbd78f.a8b058"
+        "b0a8403b.df77f8"
       ]
     ]
   },
   {
-    "id": "d4fbd78f.a8b058",
+    "id": "b0a8403b.df77f8",
     "type": "set",
     "name": "set controller domainC data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5768.450164794922,
-    "y": 2322.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5761.016830444336,
+    "y": 2333.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3ab03c8.bdf8544",
+    "id": "8b07e19d.5f94",
     "type": "switchNode",
     "name": "switch secondary empty?",
     "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3282.116668701172,
-    "y": 795.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3274.683334350586,
+    "y": 806.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7806cbe6.64ea14",
-        "91bd4861.b38048"
+        "ba76d6d3.05fe9",
+        "fe627d30.e07a9"
       ]
     ]
   },
   {
-    "id": "7806cbe6.64ea14",
+    "id": "ba76d6d3.05fe9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3404.11669921875,
-    "y": 740.11669921875,
-    "z": "f8944603.71553",
+    "x": 3396.683364868164,
+    "y": 751.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4d1b7d4.397bf04"
+        "aae22e84.83191"
       ]
     ]
   },
   {
-    "id": "91bd4861.b38048",
+    "id": "fe627d30.e07a9",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3391.11669921875,
-    "y": 849.11669921875,
-    "z": "f8944603.71553",
+    "x": 3383.683364868164,
+    "y": 860.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a8d8fc87.45b9a"
+        "652bcf4e.b1513"
       ]
     ]
   },
   {
-    "id": "4d1b7d4.397bf04",
+    "id": "aae22e84.83191",
     "type": "set",
     "name": "set hasSecondary false",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
     "comments": "",
-    "x": 3619.116668701172,
-    "y": 577.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3611.683334350586,
+    "y": 588.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a8d8fc87.45b9a",
+    "id": "652bcf4e.b1513",
     "type": "set",
     "name": "set hasSecondary true",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 3615.116668701172,
-    "y": 621.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3607.683334350586,
+    "y": 632.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "87dcb71b.a618f",
+    "id": "8877dbf4.9fef7",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3812.11669921875,
-    "y": 3521.11669921875,
-    "z": "f8944603.71553",
+    "x": 3804.683364868164,
+    "y": 3532.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9a1c6f33.80c0c"
+        "8a807ecd.e2d688"
       ]
     ]
   },
   {
-    "id": "9a1c6f33.80c0c",
+    "id": "8a807ecd.e2d688",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4003.11669921875,
-    "y": 3525.11669921875,
-    "z": "f8944603.71553",
+    "x": 3995.683364868164,
+    "y": 3536.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8de09ee3.1f82b8"
+        "157127d1.cb4078"
       ]
     ]
   },
   {
-    "id": "8de09ee3.1f82b8",
+    "id": "157127d1.cb4078",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4130.11669921875,
-    "y": 3524.11669921875,
-    "z": "f8944603.71553",
+    "x": 4122.683364868164,
+    "y": 3535.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cc59ae49.952b8",
-        "3b72359b.f45e6a"
+        "75df7ed7.bf083",
+        "34e17ebd.74d332"
       ]
     ]
   },
   {
-    "id": "3b72359b.f45e6a",
+    "id": "34e17ebd.74d332",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4352.11669921875,
-    "y": 3413.11669921875,
-    "z": "f8944603.71553",
+    "x": 4344.683364868164,
+    "y": 3424.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "d566dc7.835f6a",
+    "id": "877b276.88c73d8",
     "type": "set",
     "name": "unset secondary related variables",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
     "comments": "",
-    "x": 3357,
-    "y": 453,
-    "z": "f8944603.71553",
+    "x": 3349.566665649414,
+    "y": 464,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cc59ae49.952b8",
+    "id": "75df7ed7.bf083",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4348,
-    "y": 3472,
-    "z": "f8944603.71553",
+    "x": 4340.566665649414,
+    "y": 3483,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e0cf290a.3bb57",
-        "91bee9e5.bd12c8"
+        "298158e5.1b02b8",
+        "8816a027.c5ad7"
       ]
     ]
   },
   {
-    "id": "e0cf290a.3bb57",
+    "id": "298158e5.1b02b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4558,
-    "y": 3449,
-    "z": "f8944603.71553",
+    "x": 4550.566665649414,
+    "y": 3460,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2e6c4f7b.89f37"
+        "2754d16a.8d72ae"
       ]
     ]
   },
   {
-    "id": "2e6c4f7b.89f37",
+    "id": "2754d16a.8d72ae",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4684,
-    "y": 3449,
-    "z": "f8944603.71553",
+    "x": 4676.566665649414,
+    "y": 3460,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e80cf077.13626"
+        "1ec26074.15dbf"
       ]
     ]
   },
   {
-    "id": "eb956f81.674a8",
+    "id": "7bc2899d.3cc8d",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4689,
-    "y": 3498,
-    "z": "f8944603.71553",
+    "x": 4681.566665649414,
+    "y": 3509,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "538ba095.13ecb8",
-        "a894e133.03a62",
-        "bbac82b0.611ad8",
-        "5d08bff9.d57b18"
+        "4336d7d0.b3e05",
+        "60df6ba0.591fdc",
+        "73d9646c.b91d7c",
+        "81cba3c.9ee8de"
       ]
     ]
   },
   {
-    "id": "91bee9e5.bd12c8",
+    "id": "8816a027.c5ad7",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4563,
-    "y": 3498,
-    "z": "f8944603.71553",
+    "x": 4555.566665649414,
+    "y": 3509,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "eb956f81.674a8"
+        "7bc2899d.3cc8d"
       ]
     ]
   },
   {
-    "id": "e80cf077.13626",
+    "id": "1ec26074.15dbf",
     "type": "save",
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5012,
-    "y": 3446,
-    "z": "f8944603.71553",
+    "x": 5004.566665649414,
+    "y": 3457,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "538ba095.13ecb8",
+    "id": "4336d7d0.b3e05",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainC",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4965,
-    "y": 3537,
-    "z": "f8944603.71553",
+    "x": 4957.566665649414,
+    "y": 3548,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "a894e133.03a62",
+    "id": "60df6ba0.591fdc",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4913,
-    "y": 3579,
-    "z": "f8944603.71553",
+    "x": 4905.566665649414,
+    "y": 3590,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "bbac82b0.611ad8",
+    "id": "73d9646c.b91d7c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5042,
-    "y": 3621,
-    "z": "f8944603.71553",
+    "x": 5034.566665649414,
+    "y": 3632,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "7be6dab9.621efc",
+    "id": "63767aff.e83474",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 4928,
-    "y": 3494,
-    "z": "f8944603.71553",
+    "x": 4920.566665649414,
+    "y": 3505,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5d08bff9.d57b18",
+    "id": "81cba3c.9ee8de",
     "type": "save",
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5020,
-    "y": 3669,
-    "z": "f8944603.71553",
+    "x": 5012.566665649414,
+    "y": 3680,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "748bc1ca.c78678",
+    "id": "238550a0.c6cd18",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3840,
-    "y": 3472,
-    "z": "f8944603.71553",
+    "x": 3832.566665649414,
+    "y": 3483,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "286f0ec8.852352",
+    "id": "374b533b.d2c934",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3815,
-    "y": 4143,
-    "z": "f8944603.71553",
+    "x": 3807.566665649414,
+    "y": 4154,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d7543b1f.0223a"
+        "42d7b44a.367424"
       ]
     ]
   },
   {
-    "id": "d7543b1f.0223a",
+    "id": "42d7b44a.367424",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4007,
-    "y": 4138,
-    "z": "f8944603.71553",
+    "x": 3999.566665649414,
+    "y": 4149,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8aacb5a.7bd82c8"
+        "aa122d60.47dec8"
       ]
     ]
   },
   {
-    "id": "8aacb5a.7bd82c8",
+    "id": "aa122d60.47dec8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4136,
-    "y": 4138,
-    "z": "f8944603.71553",
+    "x": 4128.566665649414,
+    "y": 4149,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9ecf386c.da77f"
+        "bc496cc4.1ac428"
       ]
     ]
   },
   {
-    "id": "9ecf386c.da77f",
+    "id": "bc496cc4.1ac428",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4468,
-    "y": 4136,
-    "z": "f8944603.71553",
+    "x": 4460.566665649414,
+    "y": 4147,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "2bbca6cc.0ec622",
+    "id": "e008f489.a45f08",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3803,
-    "y": 4367,
-    "z": "f8944603.71553",
+    "x": 3795.566665649414,
+    "y": 4378,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "85f62fba.be3af8"
+        "7e1de7f3.95bcb"
       ]
     ]
   },
   {
-    "id": "85f62fba.be3af8",
+    "id": "7e1de7f3.95bcb",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3983,
-    "y": 4366,
-    "z": "f8944603.71553",
+    "x": 3975.566665649414,
+    "y": 4377,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f0b10235.e7e788"
+        "5cd7b855.2a4ef"
       ]
     ]
   },
   {
-    "id": "f0b10235.e7e788",
+    "id": "5cd7b855.2a4ef",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4112,
-    "y": 4366,
-    "z": "f8944603.71553",
+    "x": 4104.566665649414,
+    "y": 4377,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ccf3ecf0.96a2b"
+        "e3d19dba.c0bd7"
       ]
     ]
   },
   {
-    "id": "ccf3ecf0.96a2b",
+    "id": "e3d19dba.c0bd7",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4329.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4322.449966430664,
+    "y": 4375.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cabe89a7.9d69e"
+        "53c7d161.8eb9"
       ]
     ]
   },
   {
-    "id": "cabe89a7.9d69e",
+    "id": "53c7d161.8eb9",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4544.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4537.449966430664,
+    "y": 4375.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "760290ae.a21e"
+        "fbe01cc.5b1afe"
       ]
     ]
   },
   {
-    "id": "760290ae.a21e",
+    "id": "fbe01cc.5b1afe",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4676.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4669.449966430664,
+    "y": 4375.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d0b7affb.c1db2"
+        "2bf4a87a.e670f8"
       ]
     ]
   },
   {
-    "id": "d0b7affb.c1db2",
+    "id": "2bf4a87a.e670f8",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5041,
-    "y": 4364,
-    "z": "f8944603.71553",
+    "x": 5033.566665649414,
+    "y": 4375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c32fbe2a.4ce3f",
+    "id": "1e2222c.7b917dd",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3478,
-    "y": 4622,
-    "z": "f8944603.71553",
+    "x": 3470.566665649414,
+    "y": 4633,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f2b98ff2.538df8"
+        "99a3a0e8.0b0e08"
       ]
     ]
   },
   {
-    "id": "f2b98ff2.538df8",
+    "id": "99a3a0e8.0b0e08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3658,
-    "y": 4621,
-    "z": "f8944603.71553",
+    "x": 3650.566665649414,
+    "y": 4632,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "44866831.1c971"
+        "34a5a7ab.8782f"
       ]
     ]
   },
   {
-    "id": "44866831.1c971",
+    "id": "34a5a7ab.8782f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3787,
-    "y": 4621,
-    "z": "f8944603.71553",
+    "x": 3779.566665649414,
+    "y": 4632,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "531a8e91.6c36e8"
+        "41dd40eb.c66e7"
       ]
     ]
   },
   {
-    "id": "6aa2083f.c88dc",
+    "id": "1e73a5a2.1f85da",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3523,
-    "y": 4680,
-    "z": "f8944603.71553",
+    "x": 3515.566665649414,
+    "y": 4691,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5db121cf.f62b2",
+    "id": "d18a7342.6feac8",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4089,
-    "y": 4779,
-    "z": "f8944603.71553",
+    "x": 4081.566665649414,
+    "y": 4790,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "531a8e91.6c36e8",
+    "id": "41dd40eb.c66e7",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3553,
-    "y": 4713,
-    "z": "f8944603.71553",
+    "x": 3545.566665649414,
+    "y": 4724,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5ffa37b0.a29d98",
-        "2e65d2b6.ac2056",
-        "b5462b77.92e368"
+        "f4cc70f5.9b6bc",
+        "ce8af9cd.332b9",
+        "130dfbc3.4a6c5c"
       ]
     ]
   },
   {
-    "id": "2e65d2b6.ac2056",
+    "id": "ce8af9cd.332b9",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3734.490966796875,
-    "y": 4690.57421875,
-    "z": "f8944603.71553",
+    "x": 3727.057632446289,
+    "y": 4701.57421875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5fe821cf.842878"
+        "3c80b807.6a4d88"
       ]
     ]
   },
   {
-    "id": "b5462b77.92e368",
+    "id": "130dfbc3.4a6c5c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3723,
-    "y": 4730,
-    "z": "f8944603.71553",
+    "x": 3715.566665649414,
+    "y": 4741,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6ea658d1.17df7"
+        "c80f59b7.c8277"
       ]
     ]
   },
   {
-    "id": "5fe821cf.842878",
+    "id": "3c80b807.6a4d88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3894.0625,
-    "y": 4688.85986328125,
-    "z": "f8944603.71553",
+    "x": 3886.629165649414,
+    "y": 4699.85986328125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6ea658d1.17df7",
+    "id": "c80f59b7.c8277",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3884,
-    "y": 4731,
-    "z": "f8944603.71553",
+    "x": 3876.566665649414,
+    "y": 4742,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "4792a0c5.aeb76",
+    "id": "96ee8bec.e5c4a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3886,
-    "y": 4775,
-    "z": "f8944603.71553",
+    "x": 3878.566665649414,
+    "y": 4786,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "78930237.780be4",
-        "5db121cf.f62b2"
+        "60b9b66c.eef658",
+        "d18a7342.6feac8"
       ]
     ]
   },
   {
-    "id": "5ffa37b0.a29d98",
+    "id": "f4cc70f5.9b6bc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3728,
-    "y": 4767,
-    "z": "f8944603.71553",
+    "x": 3720.566665649414,
+    "y": 4778,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4792a0c5.aeb76"
+        "96ee8bec.e5c4a8"
       ]
     ]
   },
   {
-    "id": "78930237.780be4",
+    "id": "60b9b66c.eef658",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4047,
-    "y": 4707,
-    "z": "f8944603.71553",
+    "x": 4039.566665649414,
+    "y": 4718,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "74408c25.ef5164",
+    "id": "eedd5a70.956fd8",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4413,
-    "y": 5275,
-    "z": "f8944603.71553",
+    "x": 4405.566665649414,
+    "y": 5286,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d1a4e2c9.15ac9",
+    "id": "76d94500.85b34c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4568,
-    "y": 5316,
-    "z": "f8944603.71553",
+    "x": 4560.566665649414,
+    "y": 5327,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "748b1299.fd2144",
+    "id": "5f94b51d.236064",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5011,
-    "y": 5364,
-    "z": "f8944603.71553",
+    "x": 5003.566665649414,
+    "y": 5375,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "24040f90.d6a4",
+    "id": "66bf889f.a4f118",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4384,
-    "y": 5374,
-    "z": "f8944603.71553",
+    "x": 4376.566665649414,
+    "y": 5385,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f8d36d32.9ac71",
-        "9cd0c03a.a311a"
+        "b509f4ce.23c808",
+        "425be1a9.ccccd8"
       ]
     ]
   },
   {
-    "id": "f8d36d32.9ac71",
+    "id": "b509f4ce.23c808",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620,
-    "y": 5358,
-    "z": "f8944603.71553",
+    "x": 4612.566665649414,
+    "y": 5369,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d753b8f.12e03c8"
+        "1cce9d9d.44252a"
       ]
     ]
   },
   {
-    "id": "d753b8f.12e03c8",
+    "id": "1cce9d9d.44252a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4764,
-    "y": 5360,
-    "z": "f8944603.71553",
+    "x": 4756.566665649414,
+    "y": 5371,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "748b1299.fd2144",
-        "9643625b.90e238",
-        "c3f4caa.3b73cb8"
+        "5f94b51d.236064",
+        "efe8a2f7.303938",
+        "b992a481.10f3f"
       ]
     ]
   },
   {
-    "id": "9cd0c03a.a311a",
+    "id": "425be1a9.ccccd8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4619,
-    "y": 5406,
-    "z": "f8944603.71553",
+    "x": 4611.566665649414,
+    "y": 5417,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "9643625b.90e238",
+    "id": "efe8a2f7.303938",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5132,
-    "y": 5411,
-    "z": "f8944603.71553",
+    "x": 5124.566665649414,
+    "y": 5422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c3f4caa.3b73cb8",
+    "id": "b992a481.10f3f",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5013.6669921875,
-    "y": 5496.08349609375,
-    "z": "f8944603.71553",
+    "x": 5006.233657836914,
+    "y": 5507.08349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "433011d7.349ae8",
+    "id": "3dbfccd3.2b6904",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5014.8837890625,
-    "y": 5454.88330078125,
-    "z": "f8944603.71553",
+    "x": 5007.450454711914,
+    "y": 5465.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "e2691c6e.49966",
+    "id": "c4e3627c.f5b198",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5546,
-    "y": 5843,
-    "z": "f8944603.71553",
+    "x": 5538.566665649414,
+    "y": 5854,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7492e58a.da53dc",
+    "id": "316a2790.87ce5",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4919,
-    "y": 5853,
-    "z": "f8944603.71553",
+    "x": 4911.566665649414,
+    "y": 5864,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7d7daf2e.06b168",
-        "1dddd00a.b82ef8"
+        "2b91cb0d.4b878c",
+        "b9e860d6.0863a"
       ]
     ]
   },
   {
-    "id": "7d7daf2e.06b168",
+    "id": "2b91cb0d.4b878c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5152,
-    "y": 5847,
-    "z": "f8944603.71553",
+    "x": 5144.566665649414,
+    "y": 5858,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "51e74c47.c309bc"
+        "617327bf.d18368"
       ]
     ]
   },
   {
-    "id": "51e74c47.c309bc",
+    "id": "617327bf.d18368",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5299,
-    "y": 5855,
-    "z": "f8944603.71553",
+    "x": 5291.566665649414,
+    "y": 5866,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e2691c6e.49966",
-        "f2071b27.722968",
-        "ce8449a1.6c0af8"
+        "c4e3627c.f5b198",
+        "7767e038.8b5bf",
+        "5189b1c7.a8726"
       ]
     ]
   },
   {
-    "id": "1dddd00a.b82ef8",
+    "id": "b9e860d6.0863a",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5153,
-    "y": 5897,
-    "z": "f8944603.71553",
+    "x": 5145.566665649414,
+    "y": 5908,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2071b27.722968",
+    "id": "7767e038.8b5bf",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5667,
-    "y": 5890,
-    "z": "f8944603.71553",
+    "x": 5659.566665649414,
+    "y": 5901,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce8449a1.6c0af8",
+    "id": "5189b1c7.a8726",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5548.6669921875,
-    "y": 5975.08349609375,
-    "z": "f8944603.71553",
+    "x": 5541.233657836914,
+    "y": 5986.08349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "6cf05b70.9ecfd4",
+    "id": "be3f8000.1758f8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5549.8837890625,
-    "y": 5933.88330078125,
-    "z": "f8944603.71553",
+    "x": 5542.450454711914,
+    "y": 5944.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b08c7802.5d204",
+    "id": "5021b590.5d75e4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5080,
-    "y": 5803,
-    "z": "f8944603.71553",
+    "x": 5072.566665649414,
+    "y": 5814,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "e97fbec2.db6de",
+    "id": "92959871.fa0e08",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4914,
-    "y": 5764,
-    "z": "f8944603.71553",
+    "x": 4906.566665649414,
+    "y": 5775,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "651a17c0.63b678",
+    "id": "899de386.880988",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3241.25,
-    "y": 6373.25,
-    "z": "f8944603.71553",
+    "x": 3233.816665649414,
+    "y": 6384.25,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "74077cd7.2a1a94",
-        "f3174188.6084b"
+        "1f7a42c6.29cf15",
+        "5608d8df.18871"
       ]
     ]
   },
   {
-    "id": "74077cd7.2a1a94",
+    "id": "1f7a42c6.29cf15",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3432.25,
-    "y": 6377.25,
-    "z": "f8944603.71553",
+    "x": 3424.816665649414,
+    "y": 6388.25,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f2351c78.3536d"
+        "d6990f3f.a131a8"
       ]
     ]
   },
   {
-    "id": "f2351c78.3536d",
+    "id": "d6990f3f.a131a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3559.25,
-    "y": 6376.25,
-    "z": "f8944603.71553",
+    "x": 3551.816665649414,
+    "y": 6387.25,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9d7f2116.baeda"
+        "1cb779c6.3641ce"
       ]
     ]
   },
   {
-    "id": "f3174188.6084b",
+    "id": "5608d8df.18871",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3428.25,
-    "y": 6447.25,
-    "z": "f8944603.71553",
+    "x": 3420.816665649414,
+    "y": 6458.25,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "84ee4e22.34786"
+        "9d5d9d30.3fbe28"
       ]
     ]
   },
   {
-    "id": "bf4fd4bd.d3efb",
+    "id": "60292317.f03774",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3977.75,
-    "y": 6446.33349609375,
-    "z": "f8944603.71553",
+    "x": 3970.316665649414,
+    "y": 6457.33349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "84ee4e22.34786",
+    "id": "9d5d9d30.3fbe28",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3561.75,
-    "y": 6449.33349609375,
-    "z": "f8944603.71553",
+    "x": 3554.316665649414,
+    "y": 6460.33349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "bf4fd4bd.d3efb"
+        "60292317.f03774"
       ]
     ]
   }
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 19a9e993..6b46d326 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": "2f28023e.39f0ce",
+    "id": "9b0ef60b.7214f",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 96.5,
-    "y": 107,
-    "z": "4138d8f7.da252",
+    "x": 179.56666564941406,
+    "y": 189.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "73cc7959.44f0a"
+        "fb71b372.446598"
       ]
     ]
   },
   {
-    "id": "73cc7959.44f0a",
+    "id": "fb71b372.446598",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,10540 +22,10540 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 380.7856903076172,
-    "y": 168.23810863494873,
-    "z": "4138d8f7.da252",
+    "x": 463.85235595703125,
+    "y": 250.52385997772217,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "22ecaa15.62efee"
+        "661c7873.62c16"
       ]
     ]
   },
   {
-    "id": "22ecaa15.62efee",
+    "id": "661c7873.62c16",
     "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": 386.92860412597656,
-    "y": 253.00003051757812,
-    "z": "4138d8f7.da252",
+    "x": 469.9952697753906,
+    "y": 335.28578186035156,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c060beae.bc9e28"
+        "f0354603.74586"
       ]
     ]
   },
   {
-    "id": "c060beae.bc9e28",
+    "id": "f0354603.74586",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 736.5,
-    "y": 312,
-    "z": "4138d8f7.da252",
+    "x": 819.5666656494141,
+    "y": 394.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "915751c1.614528",
-        "36f6973a.34e678",
-        "493b4ec5.6de3"
+        "729f4799.a6df6",
+        "82d86696.e8f5a",
+        "381a9eda.91673a"
       ]
     ]
   },
   {
-    "id": "915751c1.614528",
+    "id": "729f4799.a6df6",
     "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": 1037.83349609375,
-    "y": 582.9302978515625,
-    "z": "4138d8f7.da252",
+    "x": 1120.900161743164,
+    "y": 665.2160491943359,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "36f6973a.34e678",
+    "id": "82d86696.e8f5a",
     "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": 1059.261962890625,
-    "y": 285.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1142.328628540039,
+    "y": 367.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "488c3b3e.f19244",
-        "775f6bb9.6a72cc",
-        "cd7c45c1.b6f318"
+        "19e3f412.c2895c",
+        "22e3b9e.2e85d46",
+        "d1fd3935.e60aa8"
       ]
     ]
   },
   {
-    "id": "488c3b3e.f19244",
+    "id": "19e3f412.c2895c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1284.261962890625,
-    "y": 143.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1367.328628540039,
+    "y": 225.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "86fe6a1f.5037f8"
+        "bdfafca5.bdc978"
       ]
     ]
   },
   {
-    "id": "775f6bb9.6a72cc",
+    "id": "22e3b9e.2e85d46",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1279.7529296875,
-    "y": 212.9073486328125,
-    "z": "4138d8f7.da252",
+    "x": 1362.819595336914,
+    "y": 295.19309997558594,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "de07150f.9aa728"
+        "f555968c.0ca438"
       ]
     ]
   },
   {
-    "id": "cd7c45c1.b6f318",
+    "id": "d1fd3935.e60aa8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1268.261962890625,
-    "y": 259.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1351.328628540039,
+    "y": 341.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "45b0306e.39dc08"
+        "cd958c5e.148ca8"
       ]
     ]
   },
   {
-    "id": "354c5c1b.22efdc",
+    "id": "60f90238.97edc4",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1038.261962890625,
-    "y": 173.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1121.328628540039,
+    "y": 255.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "493b4ec5.6de3",
+    "id": "381a9eda.91673a",
     "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": 1026.261962890625,
-    "y": 225.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1109.328628540039,
+    "y": 307.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "86fe6a1f.5037f8",
+    "id": "bdfafca5.bdc978",
     "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": 1524.5,
-    "y": 140,
-    "z": "4138d8f7.da252",
+    "x": 1607.566665649414,
+    "y": 222.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ee0543f9.1cf788",
-        "5497352b.e1aeec"
+        "1d20e341.a27c1d",
+        "5ce58924.9a36f"
       ]
     ]
   },
   {
-    "id": "de07150f.9aa728",
+    "id": "f555968c.0ca438",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 1434.5623779296875,
-    "y": 215.85977172851562,
-    "z": "4138d8f7.da252",
+    "x": 1517.6290435791016,
+    "y": 298.14552307128906,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "45b0306e.39dc08",
+    "id": "cd958c5e.148ca8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1438.5,
-    "y": 260,
-    "z": "4138d8f7.da252",
+    "x": 1521.566665649414,
+    "y": 342.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ee0543f9.1cf788",
+    "id": "1d20e341.a27c1d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1729.5,
-    "y": 177,
-    "z": "4138d8f7.da252",
+    "x": 1812.566665649414,
+    "y": 259.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6345f4d0.12f85c"
+        "e28a7a1e.c07b78"
       ]
     ]
   },
   {
-    "id": "5497352b.e1aeec",
+    "id": "5ce58924.9a36f",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1739.5,
-    "y": 104,
-    "z": "4138d8f7.da252",
+    "x": 1822.566665649414,
+    "y": 186.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "6345f4d0.12f85c",
+    "id": "e28a7a1e.c07b78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1722.5,
-    "y": 252,
-    "z": "4138d8f7.da252",
+    "x": 1805.566665649414,
+    "y": 334.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c2cf8029.375a4",
-        "3a106a22.349b86",
-        "f24d529e.b55f9",
-        "26407648.4cfd4a",
-        "5e06fc8.b063184"
+        "fd95487b.da105",
+        "526e7fc2.050288",
+        "a11cf219.9bf18",
+        "8ac4fdd4.d603a8",
+        "c717d5f4.4fddc8"
       ]
     ]
   },
   {
-    "id": "34fb97ab.b3686",
+    "id": "324358a6.ea813",
     "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": 2208.5,
-    "y": 303,
-    "z": "4138d8f7.da252",
+    "x": 2291.566665649414,
+    "y": 385.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4a2e58a2.751648",
-        "c91e93c5.362468",
-        "ad2e905e.658598"
+        "6086efb9.edfcd",
+        "9b93dfe7.0d77",
+        "a7f7b2f5.24504"
       ]
     ]
   },
   {
-    "id": "4a2e58a2.751648",
+    "id": "6086efb9.edfcd",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2424.5,
-    "y": 370,
-    "z": "4138d8f7.da252",
+    "x": 2507.566665649414,
+    "y": 452.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2d931b81.0000fc"
+        "a12dc51a.620ef"
       ]
     ]
   },
   {
-    "id": "c91e93c5.362468",
+    "id": "9b93dfe7.0d77",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2424.990966796875,
-    "y": 269.573974609375,
-    "z": "4138d8f7.da252",
+    "x": 2508.057632446289,
+    "y": 351.85972595214844,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2c737e52.6b21f2"
+        "adc977fa.7cd608"
       ]
     ]
   },
   {
-    "id": "ad2e905e.658598",
+    "id": "a7f7b2f5.24504",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2420.5,
-    "y": 319,
-    "z": "4138d8f7.da252",
+    "x": 2503.566665649414,
+    "y": 401.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "81005112.39dbe"
+        "4d4bdb5a.3763ac"
       ]
     ]
   },
   {
-    "id": "c2cf8029.375a4",
+    "id": "fd95487b.da105",
     "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": 1925.5,
-    "y": 284,
-    "z": "4138d8f7.da252",
+    "x": 2008.566665649414,
+    "y": 366.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9843a.b676f3c68",
-        "34fb97ab.b3686",
-        "cf6d7172.69b4b8",
-        "326038f4.f291a"
+        "cc186f28.ba2c9",
+        "324358a6.ea813",
+        "ab78fc6f.8a0998",
+        "1e0dcc9a.c7d15b"
       ]
     ]
   },
   {
-    "id": "9843a.b676f3c68",
+    "id": "cc186f28.ba2c9",
     "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": 2205.5,
-    "y": 222,
-    "z": "4138d8f7.da252",
+    "x": 2288.566665649414,
+    "y": 304.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "26407648.4cfd4a",
+    "id": "8ac4fdd4.d603a8",
     "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": 1899.5,
-    "y": 234,
-    "z": "4138d8f7.da252",
+    "x": 1982.566665649414,
+    "y": 316.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3a106a22.349b86",
+    "id": "526e7fc2.050288",
     "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": 1942.5,
-    "y": 93,
-    "z": "4138d8f7.da252",
+    "x": 2025.566665649414,
+    "y": 175.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f24d529e.b55f9",
+    "id": "a11cf219.9bf18",
     "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": 1954.5,
-    "y": 134,
-    "z": "4138d8f7.da252",
+    "x": 2037.566665649414,
+    "y": 216.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "a7bf0e61.b8215",
+    "id": "2d1a927f.4e32b6",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 1979.5,
-    "y": 46,
-    "z": "4138d8f7.da252",
+    "x": 2062.566665649414,
+    "y": 128.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "68130b3.2f48af4",
+    "id": "9e25d87e.938588",
     "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": 1899.5,
-    "y": 180,
-    "z": "4138d8f7.da252",
+    "x": 1982.566665649414,
+    "y": 262.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2c737e52.6b21f2",
+    "id": "adc977fa.7cd608",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 2603.5,
-    "y": 272,
-    "z": "4138d8f7.da252",
+    "x": 2686.566665649414,
+    "y": 354.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "81005112.39dbe",
+    "id": "4d4bdb5a.3763ac",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2603.4375,
-    "y": 321.1402587890625,
-    "z": "4138d8f7.da252",
+    "x": 2686.504165649414,
+    "y": 403.42601013183594,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2d931b81.0000fc",
+    "id": "a12dc51a.620ef",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2605.4375,
-    "y": 372.1402587890625,
-    "z": "4138d8f7.da252",
+    "x": 2688.504165649414,
+    "y": 454.42601013183594,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4511b10b.b4e2e8"
+        "e28b2f59.3a0188"
       ]
     ]
   },
   {
-    "id": "4511b10b.b4e2e8",
+    "id": "e28b2f59.3a0188",
     "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": 2940.4375,
-    "y": 141.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3023.504165649414,
+    "y": 223.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9fb16699.1235d",
-        "da567395.79b6d8",
-        "8ed0fbe8.03e31"
+        "5b54194d.44ebe",
+        "aebf4283.d1be78",
+        "4cc0a7b0.54364"
       ]
     ]
   },
   {
-    "id": "da567395.79b6d8",
+    "id": "aebf4283.d1be78",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3213.928466796875,
-    "y": 33.71424865722656,
-    "z": "4138d8f7.da252",
+    "x": 3296.995132446289,
+    "y": 116,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1dbb6caf.82e0eb"
+        "bfbb6bff.50e7e8"
       ]
     ]
   },
   {
-    "id": "1dbb6caf.82e0eb",
+    "id": "bfbb6bff.50e7e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3391.5,
-    "y": 34.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3474.566665649414,
+    "y": 116.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8ed0fbe8.03e31",
+    "id": "4cc0a7b0.54364",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3209.4375,
-    "y": 83.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3292.504165649414,
+    "y": 165.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1a97687b.99c02"
+        "8ce95b42.618ca8"
       ]
     ]
   },
   {
-    "id": "1a97687b.99c02",
+    "id": "8ce95b42.618ca8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3391.4375,
-    "y": 83.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3474.504165649414,
+    "y": 165.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9fb16699.1235d",
+    "id": "5b54194d.44ebe",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3213.4375,
-    "y": 134.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3296.504165649414,
+    "y": 216.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "470c276f.ad2f08"
+        "6f465aa6.4f1ee4"
       ]
     ]
   },
   {
-    "id": "470c276f.ad2f08",
+    "id": "6f465aa6.4f1ee4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3393.4375,
-    "y": 134.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3476.504165649414,
+    "y": 216.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ece8c0f8.d3abf8"
+        "7a127cf4.cf8b34"
       ]
     ]
   },
   {
-    "id": "ece8c0f8.d3abf8",
+    "id": "7a127cf4.cf8b34",
     "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": 2959.5,
-    "y": 269.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3042.566665649414,
+    "y": 351.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dba346c3.39c8a8",
-        "4ccdd4a0.9c665c"
+        "9cc4aaf6.859c",
+        "9d86e661.45c7f"
       ]
     ]
   },
   {
-    "id": "4ccdd4a0.9c665c",
+    "id": "9d86e661.45c7f",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3269.5,
-    "y": 276.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3352.566665649414,
+    "y": 358.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "dba346c3.39c8a8",
+    "id": "9cc4aaf6.859c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3268.5,
-    "y": 330.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3351.566665649414,
+    "y": 412.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e2cad6e.ad95028"
+        "c9c4f2a.9305f9"
       ]
     ]
   },
   {
-    "id": "fde9905b.0e0dc",
+    "id": "af10f438.0ffb48",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4013.5,
-    "y": 284.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 4096.566665649414,
+    "y": 366.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "be0ed66c.68b118"
+        "96cf18f1.1cad5"
       ]
     ]
   },
   {
-    "id": "be0ed66c.68b118",
+    "id": "96cf18f1.1cad5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4190.4998779296875,
-    "y": 276.99989318847656,
-    "z": "4138d8f7.da252",
+    "x": 4273.566543579102,
+    "y": 359.28564453125,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1aebcc98.e81703",
-        "a36c8474.3e9148"
+        "c590372d.ec562",
+        "d84bff3f.0a18c8"
       ]
     ]
   },
   {
-    "id": "e2cad6e.ad95028",
+    "id": "c9c4f2a.9305f9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3432.5,
-    "y": 256.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3515.566665649414,
+    "y": 338.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f52b5162.d3155",
-        "28c7d65.67fb0aa"
+        "ec6a7a84.d65408",
+        "7d25e53c.8a468c"
       ]
     ]
   },
   {
-    "id": "f52b5162.d3155",
+    "id": "ec6a7a84.d65408",
     "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": 3713.5,
-    "y": 212.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3796.566665649414,
+    "y": 294.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "40678a93.0b11fc"
+        "7204f6fc.5ab2"
       ]
     ]
   },
   {
-    "id": "40678a93.0b11fc",
+    "id": "7204f6fc.5ab2",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3975.5,
-    "y": 212.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 4058.566665649414,
+    "y": 294.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fde9905b.0e0dc"
+        "af10f438.0ffb48"
       ]
     ]
   },
   {
-    "id": "1aebcc98.e81703",
+    "id": "c590372d.ec562",
     "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": 4433.4998779296875,
-    "y": 233.99989318847656,
-    "z": "4138d8f7.da252",
+    "x": 4516.566543579102,
+    "y": 316.28564453125,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a36c8474.3e9148",
+    "id": "d84bff3f.0a18c8",
     "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": 4422.4998779296875,
-    "y": 288.99989318847656,
-    "z": "4138d8f7.da252",
+    "x": 4505.566543579102,
+    "y": 371.28564453125,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f4703396.8f997",
-        "c4863aea.39d3c",
-        "3f105248.ebf0a6"
+        "bcf7cb3d.813c08",
+        "241d629e.3937f6",
+        "ab4a02d2.dd63f8"
       ]
     ]
   },
   {
-    "id": "3f105248.ebf0a6",
+    "id": "ab4a02d2.dd63f8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4753.5,
-    "y": 197,
-    "z": "4138d8f7.da252",
+    "x": 4836.566665649414,
+    "y": 279.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f39e3f38.4d2868"
+        "6fe3d858.7ad19"
       ]
     ]
   },
   {
-    "id": "f39e3f38.4d2868",
+    "id": "6fe3d858.7ad19",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4902.071533203125,
-    "y": 197.2857666015625,
-    "z": "4138d8f7.da252",
+    "x": 4985.138198852539,
+    "y": 279.57151794433594,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9b475b7a.781198",
+    "id": "3cab2fad.4b6d28",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4901.009033203125,
-    "y": 241.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 4984.075698852539,
+    "y": 323.71177673339844,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c4863aea.39d3c",
+    "id": "241d629e.3937f6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4742.009033203125,
-    "y": 241.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 4825.075698852539,
+    "y": 323.71177673339844,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9b475b7a.781198"
+        "3cab2fad.4b6d28"
       ]
     ]
   },
   {
-    "id": "f4703396.8f997",
+    "id": "bcf7cb3d.813c08",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4749.009033203125,
-    "y": 320.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 4832.075698852539,
+    "y": 402.71177673339844,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a4728a38.a45e8"
+        "c61a87d8.32a11"
       ]
     ]
   },
   {
-    "id": "a4728a38.a45e8",
+    "id": "c61a87d8.32a11",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4888.009033203125,
-    "y": 320.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 4971.075698852539,
+    "y": 402.71177673339844,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6805f17a.2a0698",
-        "a9ae4e95.32ef88"
+        "ab565ac9.d97978",
+        "cf0bc947.03a4d"
       ]
     ]
   },
   {
-    "id": "6805f17a.2a0698",
+    "id": "ab565ac9.d97978",
     "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": 5093.5,
-    "y": 318,
-    "z": "4138d8f7.da252",
+    "x": 5176.566665649414,
+    "y": 400.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a9ae4e95.32ef88",
+    "id": "cf0bc947.03a4d",
     "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": 5092.5,
-    "y": 364,
-    "z": "4138d8f7.da252",
+    "x": 5175.566665649414,
+    "y": 446.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "28c7d65.67fb0aa",
+    "id": "7d25e53c.8a468c",
     "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": 3530.5,
-    "y": 328.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3613.566665649414,
+    "y": 410.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ebdf975.aa03968"
+        "95ed8dc.322967"
       ]
     ]
   },
   {
-    "id": "ebdf975.aa03968",
+    "id": "95ed8dc.322967",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3810.5,
-    "y": 328.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3893.566665649414,
+    "y": 410.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3f67ae4e.a2076a"
+        "e85bd9f4.7a28d"
       ]
     ]
   },
   {
-    "id": "3f67ae4e.a2076a",
+    "id": "e85bd9f4.7a28d",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2181.5001220703125,
-    "y": 759.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 2264.5667877197266,
+    "y": 841.2858734130859,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f83af2f7.dfb288"
+        "53210c7d.ec4f8c"
       ]
     ]
   },
   {
-    "id": "f83af2f7.dfb288",
+    "id": "53210c7d.ec4f8c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2358.5,
-    "y": 752,
-    "z": "4138d8f7.da252",
+    "x": 2441.566665649414,
+    "y": 834.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a0742463.c2c6f8",
-        "25034b30.dd6634"
+        "6d10b617.947758",
+        "dd67d7f2.9348e"
       ]
     ]
   },
   {
-    "id": "a0742463.c2c6f8",
+    "id": "6d10b617.947758",
     "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": 2601.5,
-    "y": 709,
-    "z": "4138d8f7.da252",
+    "x": 2684.566665649414,
+    "y": 791.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "25034b30.dd6634",
+    "id": "dd67d7f2.9348e",
     "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": 2590.5,
-    "y": 764,
-    "z": "4138d8f7.da252",
+    "x": 2673.566665649414,
+    "y": 846.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b3267bc2.0ab17",
-        "e3342c37.4e1e3",
-        "349e46c.d16cb3a"
+        "7e4e9434.83a0d4",
+        "9cee4acb.003668",
+        "47c07099.1b14a8"
       ]
     ]
   },
   {
-    "id": "b3267bc2.0ab17",
+    "id": "7e4e9434.83a0d4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2881.990966796875,
-    "y": 742.573974609375,
-    "z": "4138d8f7.da252",
+    "x": 2965.057632446289,
+    "y": 824.8597259521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "504883f4.bc132c"
+        "bc050886.d2a05"
       ]
     ]
   },
   {
-    "id": "e3342c37.4e1e3",
+    "id": "9cee4acb.003668",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2870.5,
-    "y": 787,
-    "z": "4138d8f7.da252",
+    "x": 2953.566665649414,
+    "y": 869.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6ff791fd.bff34"
+        "c31212b9.83f5f8"
       ]
     ]
   },
   {
-    "id": "504883f4.bc132c",
+    "id": "bc050886.d2a05",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3030.5625,
-    "y": 742.8597412109375,
-    "z": "4138d8f7.da252",
+    "x": 3113.629165649414,
+    "y": 825.1454925537109,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6ff791fd.bff34",
+    "id": "c31212b9.83f5f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3029.5,
-    "y": 787,
-    "z": "4138d8f7.da252",
+    "x": 3112.566665649414,
+    "y": 869.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "349e46c.d16cb3a",
+    "id": "47c07099.1b14a8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2877.5,
-    "y": 866,
-    "z": "4138d8f7.da252",
+    "x": 2960.566665649414,
+    "y": 948.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "947e25fa.d00b28"
+        "a66b0cd4.00b53"
       ]
     ]
   },
   {
-    "id": "947e25fa.d00b28",
+    "id": "a66b0cd4.00b53",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3016.5,
-    "y": 866,
-    "z": "4138d8f7.da252",
+    "x": 3099.566665649414,
+    "y": 948.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b5aabe11.88e5f",
-        "8b8aaeb1.46c568",
-        "32905edb.461e7a",
-        "2f0ef70c.178628",
-        "6eaf37e0.1fb3a8",
-        "1abb3e71.7e1362",
-        "29e42279.9aaa7e",
-        "363ba934.edbd4e",
-        "ec67f0f.b56539",
-        "631e76e1.71afc",
-        "b17f4ff2.75d93",
-        "8048035e.723ef",
-        "d590aba5.94aa48",
-        "44b9c5d0.dda044",
-        "46e10049.e35348",
-        "f55201f.0be188",
-        "6834572.668ee28",
-        "fa7f428c.6d6b2",
-        "8c5d257.6a579d8"
+        "628231dc.fe1998",
+        "40f53355.15a3d4",
+        "6e7728cd.6d606",
+        "591f4762.52be1",
+        "72ab083b.a6528",
+        "be414195.9b77c",
+        "8abc6705.827928",
+        "5f587418.c46734",
+        "da60761c.d9f04",
+        "fd9bd7ab.c92bd8",
+        "b37c5dee.6ca208",
+        "1bc9df09.d67e59",
+        "6e895a21.1d4594",
+        "707a9dca.527c64",
+        "9cc0dadb.189ef",
+        "e9c6a99.90dcbd8",
+        "4a92500a.dfe688",
+        "25934f35.38edd",
+        "77f3463a.2b447"
       ]
     ]
   },
   {
-    "id": "479d6fca.4b7c8",
+    "id": "b0809281.c581e8",
     "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": 3328.5,
-    "y": 416,
-    "z": "4138d8f7.da252",
+    "x": 3411.566665649414,
+    "y": 498.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "b5aabe11.88e5f",
+    "id": "628231dc.fe1998",
     "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": 3315.4998779296875,
-    "y": 508,
-    "z": "4138d8f7.da252",
+    "x": 3398.5665435791016,
+    "y": 590.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "44b9c5d0.dda044",
+    "id": "707a9dca.527c64",
     "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": 3272.4998779296875,
-    "y": 553,
-    "z": "4138d8f7.da252",
+    "x": 3355.5665435791016,
+    "y": 635.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8b8aaeb1.46c568",
+    "id": "40f53355.15a3d4",
     "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": 3247.4998779296875,
-    "y": 616,
-    "z": "4138d8f7.da252",
+    "x": 3330.5665435791016,
+    "y": 698.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "32905edb.461e7a",
+    "id": "6e7728cd.6d606",
     "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": 3248.4998779296875,
-    "y": 671,
-    "z": "4138d8f7.da252",
+    "x": 3331.5665435791016,
+    "y": 753.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2f0ef70c.178628",
+    "id": "591f4762.52be1",
     "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": 3264.4998779296875,
-    "y": 719,
-    "z": "4138d8f7.da252",
+    "x": 3347.5665435791016,
+    "y": 801.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "99eab0f2.3508c",
-        "1b8f4bea.ec5e94",
-        "fc9653f8.4449d"
+        "6d204f19.ffc268",
+        "1689d04b.d0aa98",
+        "34ef36cb.86ebd2"
       ]
     ]
   },
   {
-    "id": "6eaf37e0.1fb3a8",
+    "id": "72ab083b.a6528",
     "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": 3259.5,
-    "y": 785.9998779296875,
-    "z": "4138d8f7.da252",
+    "x": 3342.566665649414,
+    "y": 868.2856292724609,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e805b604.ab84e",
-        "a86f3b5b.e29e1",
-        "cbb70d3d.0ef6a"
+        "a5360717.582308",
+        "a764163a.8df268",
+        "84d2b76f.25f11"
       ]
     ]
   },
   {
-    "id": "99eab0f2.3508c",
+    "id": "6d204f19.ffc268",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3505.5,
-    "y": 547,
-    "z": "4138d8f7.da252",
+    "x": 3588.566665649414,
+    "y": 629.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d6e995cd.85fc"
+        "424235f5.63bc3c"
       ]
     ]
   },
   {
-    "id": "1b8f4bea.ec5e94",
+    "id": "1689d04b.d0aa98",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3501.009033203125,
-    "y": 596.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 3584.075698852539,
+    "y": 678.7117767333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e5161935.335138"
+        "3044babb.9a7f0e"
       ]
     ]
   },
   {
-    "id": "fc9653f8.4449d",
+    "id": "34ef36cb.86ebd2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3505.009033203125,
-    "y": 649.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 3588.075698852539,
+    "y": 731.7117767333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "867b315e.a11f4"
+        "e8786087.fc4a5"
       ]
     ]
   },
   {
-    "id": "d6e995cd.85fc",
+    "id": "424235f5.63bc3c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3654.071533203125,
-    "y": 546.2857666015625,
-    "z": "4138d8f7.da252",
+    "x": 3737.138198852539,
+    "y": 628.5715179443359,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e5161935.335138",
+    "id": "3044babb.9a7f0e",
     "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.009033203125,
-    "y": 596.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 3727.075698852539,
+    "y": 678.7117767333984,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e805b604.ab84e",
+    "id": "a5360717.582308",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.5,
-    "y": 702.9998779296875,
-    "z": "4138d8f7.da252",
+    "x": 3592.566665649414,
+    "y": 785.2856292724609,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f25db7d5.d2a2a"
+        "d832daa6.408e"
       ]
     ]
   },
   {
-    "id": "a86f3b5b.e29e1",
+    "id": "a764163a.8df268",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3505.009033203125,
-    "y": 752.4259033203125,
-    "z": "4138d8f7.da252",
+    "x": 3588.075698852539,
+    "y": 834.7116546630859,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "86e45032.893578"
+        "b0e5525.e8ef43"
       ]
     ]
   },
   {
-    "id": "cbb70d3d.0ef6a",
+    "id": "84d2b76f.25f11",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3488.009033203125,
-    "y": 800.4259033203125,
-    "z": "4138d8f7.da252",
+    "x": 3571.075698852539,
+    "y": 882.7116546630859,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "20619d71.889cda"
+        "8b568989.b50038"
       ]
     ]
   },
   {
-    "id": "f25db7d5.d2a2a",
+    "id": "d832daa6.408e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3658.071533203125,
-    "y": 702.28564453125,
-    "z": "4138d8f7.da252",
+    "x": 3741.138198852539,
+    "y": 784.5713958740234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "86e45032.893578",
+    "id": "b0e5525.e8ef43",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3648.009033203125,
-    "y": 752.4259033203125,
-    "z": "4138d8f7.da252",
+    "x": 3731.075698852539,
+    "y": 834.7116546630859,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "867b315e.a11f4",
+    "id": "e8786087.fc4a5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3666.5,
-    "y": 649,
-    "z": "4138d8f7.da252",
+    "x": 3749.566665649414,
+    "y": 731.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2bd95045.b71158"
+        "66efb3a1.9fe73c"
       ]
     ]
   },
   {
-    "id": "20619d71.889cda",
+    "id": "8b568989.b50038",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3641.5,
-    "y": 799.9998779296875,
-    "z": "4138d8f7.da252",
+    "x": 3724.566665649414,
+    "y": 882.2856292724609,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "41de01b2.960a08"
+        "26894e1f.239b9a"
       ]
     ]
   },
   {
-    "id": "2bd95045.b71158",
+    "id": "66efb3a1.9fe73c",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3838.5,
-    "y": 649,
-    "z": "4138d8f7.da252",
+    "x": 3921.566665649414,
+    "y": 731.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6f8555c6.ec1a0c",
-        "994a0acf.d3aed8",
-        "26a90c3.2a56674"
+        "a22f1b0d.edd33",
+        "ab951b61.cb4cb8",
+        "79c99b01.4060a4"
       ]
     ]
   },
   {
-    "id": "41de01b2.960a08",
+    "id": "26894e1f.239b9a",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3833.5,
-    "y": 734,
-    "z": "4138d8f7.da252",
+    "x": 3916.566665649414,
+    "y": 816.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4b5b1a17.b9df6c",
-        "d7a475f3.ea12c",
-        "16154f9d.14a3b"
+        "a2c3d250.fc00d",
+        "aa59cf58.a145d8",
+        "fb5e94da.526bd"
       ]
     ]
   },
   {
-    "id": "6f8555c6.ec1a0c",
+    "id": "a22f1b0d.edd33",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3999.49951171875,
-    "y": 385,
-    "z": "4138d8f7.da252",
+    "x": 4082.566177368164,
+    "y": 467.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "62760f41.c93a2"
+        "2bc1e64e.d59032"
       ]
     ]
   },
   {
-    "id": "994a0acf.d3aed8",
+    "id": "ab951b61.cb4cb8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4001.49951171875,
-    "y": 439,
-    "z": "4138d8f7.da252",
+    "x": 4084.566177368164,
+    "y": 521.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "273e3fee.2bc13"
+        "453522b8.5dbac4"
       ]
     ]
   },
   {
-    "id": "4b5b1a17.b9df6c",
+    "id": "a2c3d250.fc00d",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4014.499267578125,
-    "y": 607,
-    "z": "4138d8f7.da252",
+    "x": 4097.565933227539,
+    "y": 689.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "244a1c4c.c64574"
+        "f5a4f507.86b44"
       ]
     ]
   },
   {
-    "id": "d7a475f3.ea12c",
+    "id": "aa59cf58.a145d8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4016.499267578125,
-    "y": 661,
-    "z": "4138d8f7.da252",
+    "x": 4099.565933227539,
+    "y": 743.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f48105e4.f03428"
+        "8148cd30.75333"
       ]
     ]
   },
   {
-    "id": "92f3b868.34ce6",
+    "id": "fcdd9b76.8fa5f8",
     "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": 4309.49951171875,
-    "y": 337,
-    "z": "4138d8f7.da252",
+    "x": 4392.566177368164,
+    "y": 419.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b6002239.68b828",
+    "id": "a44710c1.f4b4c8",
     "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": 4302.49951171875,
-    "y": 435,
-    "z": "4138d8f7.da252",
+    "x": 4385.566177368164,
+    "y": 517.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "55137534.cd97cc",
+    "id": "5b86250b.1183b4",
     "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": 4378.499267578125,
-    "y": 634,
-    "z": "4138d8f7.da252",
+    "x": 4461.565933227539,
+    "y": 716.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ba173e3c.d3cf48",
+    "id": "154b4953.ab9fcf",
     "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": 4382.499267578125,
-    "y": 727,
-    "z": "4138d8f7.da252",
+    "x": 4465.565933227539,
+    "y": 809.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "4d8d5caa.cdd3ac",
+    "id": "3bb3037a.178754",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3460.5,
-    "y": 1150,
-    "z": "4138d8f7.da252",
+    "x": 3543.566665649414,
+    "y": 1232.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6c40f2a8.47da04"
+        "10e4f75f.914479"
       ]
     ]
   },
   {
-    "id": "f63967f8.5c1d2",
+    "id": "8000d000.35dfa8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3469.990966796875,
-    "y": 1192.5740356445312,
-    "z": "4138d8f7.da252",
+    "x": 3553.057632446289,
+    "y": 1274.8597869873047,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cba887b8.3ba25"
+        "c201e6b8.a3178"
       ]
     ]
   },
   {
-    "id": "f4c1be52.25da4",
+    "id": "89805004.2ac398",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3458.5,
-    "y": 1239,
-    "z": "4138d8f7.da252",
+    "x": 3541.566665649414,
+    "y": 1321.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "43b1688f.a5b798"
+        "f43a00.5422b6"
       ]
     ]
   },
   {
-    "id": "f87008d1.14dd28",
+    "id": "7d1a072.a69ea78",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3160.5,
-    "y": 1112,
-    "z": "4138d8f7.da252",
+    "x": 3243.566665649414,
+    "y": 1194.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "29e42279.9aaa7e",
+    "id": "8abc6705.827928",
     "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": 3203.5,
-    "y": 1177,
-    "z": "4138d8f7.da252",
+    "x": 3286.566665649414,
+    "y": 1259.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4d8d5caa.cdd3ac",
-        "f63967f8.5c1d2",
-        "f4c1be52.25da4"
+        "3bb3037a.178754",
+        "8000d000.35dfa8",
+        "89805004.2ac398"
       ]
     ]
   },
   {
-    "id": "1abb3e71.7e1362",
+    "id": "be414195.9b77c",
     "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": 3192.5,
-    "y": 1027,
-    "z": "4138d8f7.da252",
+    "x": 3275.566665649414,
+    "y": 1109.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "252648ef.3d7f4",
-        "296ca11d.a31fd6"
+        "c53ee6d9.d92aa8",
+        "b00b21f6.61a17"
       ]
     ]
   },
   {
-    "id": "296ca11d.a31fd6",
+    "id": "b00b21f6.61a17",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3415.5,
-    "y": 1013,
-    "z": "4138d8f7.da252",
+    "x": 3498.566665649414,
+    "y": 1095.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2479711d.5bdd66"
+        "42f02ac3.9ec4a4"
       ]
     ]
   },
   {
-    "id": "252648ef.3d7f4",
+    "id": "c53ee6d9.d92aa8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3417.5,
-    "y": 1046,
-    "z": "4138d8f7.da252",
+    "x": 3500.566665649414,
+    "y": 1128.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "90f53fd9.1cbe8"
+        "dd03ebfe.8dbb"
       ]
     ]
   },
   {
-    "id": "6c40f2a8.47da04",
+    "id": "10e4f75f.914479",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3633.16650390625,
-    "y": 1149,
-    "z": "4138d8f7.da252",
+    "x": 3716.233169555664,
+    "y": 1231.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1415c282.916e3d",
-        "2cb5ed40.b34f42"
+        "e44801ab.1590c8",
+        "fa4a5699.5e244"
       ]
     ]
   },
   {
-    "id": "cba887b8.3ba25",
+    "id": "c201e6b8.a3178",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3623.5623779296875,
-    "y": 1195.8597717285156,
-    "z": "4138d8f7.da252",
+    "x": 3706.6290435791016,
+    "y": 1278.145523071289,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "43b1688f.a5b798",
+    "id": "f43a00.5422b6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3627.5,
-    "y": 1240,
-    "z": "4138d8f7.da252",
+    "x": 3710.566665649414,
+    "y": 1322.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "1415c282.916e3d",
+    "id": "e44801ab.1590c8",
     "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": 3897.5,
-    "y": 1200,
-    "z": "4138d8f7.da252",
+    "x": 3980.566665649414,
+    "y": 1282.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3e280d70.843922",
-        "95fc8503.11868"
+        "16568eac.f132a9",
+        "e40b1917.8979d8"
       ]
     ]
   },
   {
-    "id": "95fc8503.11868",
+    "id": "e40b1917.8979d8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4073.5,
-    "y": 1250,
-    "z": "4138d8f7.da252",
+    "x": 4156.566665649414,
+    "y": 1332.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dc902b38.0c7748"
+        "ac556463.ec12b8"
       ]
     ]
   },
   {
-    "id": "3e280d70.843922",
+    "id": "16568eac.f132a9",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4075.5,
-    "y": 1314,
-    "z": "4138d8f7.da252",
+    "x": 4158.566665649414,
+    "y": 1396.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "23310562.1afb82"
+        "97de31bb.b9a118"
       ]
     ]
   },
   {
-    "id": "23310562.1afb82",
+    "id": "97de31bb.b9a118",
     "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": 4237.5,
-    "y": 1310,
-    "z": "4138d8f7.da252",
+    "x": 4320.566665649414,
+    "y": 1392.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "dc902b38.0c7748",
+    "id": "ac556463.ec12b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4238.5,
-    "y": 1247,
-    "z": "4138d8f7.da252",
+    "x": 4321.566665649414,
+    "y": 1329.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cee16453.63cf3",
-        "84ccdaef.588b08"
+        "3ab9a413.979aa4",
+        "75cbb82a.35584"
       ]
     ]
   },
   {
-    "id": "90f53fd9.1cbe8",
+    "id": "dd03ebfe.8dbb",
     "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": 3560.5,
-    "y": 1043,
-    "z": "4138d8f7.da252",
+    "x": 3643.566665649414,
+    "y": 1125.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2479711d.5bdd66",
+    "id": "42f02ac3.9ec4a4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3563.5,
-    "y": 1006,
-    "z": "4138d8f7.da252",
+    "x": 3646.566665649414,
+    "y": 1088.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e0731aec.1d3d18",
-        "ff49f858.b54118"
+        "6046ec7d.2c3dac",
+        "942aecd4.e6d53"
       ]
     ]
   },
   {
-    "id": "e0731aec.1d3d18",
+    "id": "6046ec7d.2c3dac",
     "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": 3737.5,
-    "y": 962,
-    "z": "4138d8f7.da252",
+    "x": 3820.566665649414,
+    "y": 1044.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2cb5ed40.b34f42",
+    "id": "fa4a5699.5e244",
     "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": 3609.5,
-    "y": 1331,
-    "z": "4138d8f7.da252",
+    "x": 3692.566665649414,
+    "y": 1413.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f5d98ba7.1e5cb8"
+        "5ae5afb9.f0afa"
       ]
     ]
   },
   {
-    "id": "f5d98ba7.1e5cb8",
+    "id": "5ae5afb9.f0afa",
     "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": 3890.5,
-    "y": 1326,
-    "z": "4138d8f7.da252",
+    "x": 3973.566665649414,
+    "y": 1408.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "287b5bf8.99c79c"
+        "cfb3ee78.011c4"
       ]
     ]
   },
   {
-    "id": "287b5bf8.99c79c",
+    "id": "cfb3ee78.011c4",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4201.78564453125,
-    "y": 1400.82177734375,
-    "z": "4138d8f7.da252",
+    "x": 4284.852310180664,
+    "y": 1483.1075286865234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "70c360c1.95da08"
+        "658c69d5.ac8cf"
       ]
     ]
   },
   {
-    "id": "ff49f858.b54118",
+    "id": "942aecd4.e6d53",
     "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": 3752.5,
-    "y": 1073,
-    "z": "4138d8f7.da252",
+    "x": 3835.566665649414,
+    "y": 1155.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dadb26c7.629ca8",
-        "f63867c7.23e9a8",
-        "b7f169a7.e4cea8"
+        "7f200322.76207c",
+        "80c4e01c.7c07b8",
+        "71ab8804.94dd5"
       ]
     ]
   },
   {
-    "id": "dadb26c7.629ca8",
+    "id": "7f200322.76207c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3948.0001220703125,
-    "y": 1025,
-    "z": "4138d8f7.da252",
+    "x": 4031.0667877197266,
+    "y": 1107.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "56281278.4a732c"
+        "a99ba4fa.4ed1e8"
       ]
     ]
   },
   {
-    "id": "f63867c7.23e9a8",
+    "id": "80c4e01c.7c07b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3940.0001220703125,
-    "y": 1080,
-    "z": "4138d8f7.da252",
+    "x": 4023.0667877197266,
+    "y": 1162.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d5d18730.ffaa"
+        "848293a0.71bc7"
       ]
     ]
   },
   {
-    "id": "b7f169a7.e4cea8",
+    "id": "71ab8804.94dd5",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3945.0001220703125,
-    "y": 1137,
-    "z": "4138d8f7.da252",
+    "x": 4028.0667877197266,
+    "y": 1219.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5b7993c9.ffe6c4"
+        "f97b023f.267278"
       ]
     ]
   },
   {
-    "id": "5b7993c9.ffe6c4",
+    "id": "f97b023f.267278",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4097.0001220703125,
-    "y": 1138,
-    "z": "4138d8f7.da252",
+    "x": 4180.066787719727,
+    "y": 1220.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d5d18730.ffaa",
+    "id": "848293a0.71bc7",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4108.0001220703125,
-    "y": 1083,
-    "z": "4138d8f7.da252",
+    "x": 4191.066787719727,
+    "y": 1165.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "56281278.4a732c",
+    "id": "a99ba4fa.4ed1e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4092.3824462890625,
-    "y": 1022.6556701660156,
-    "z": "4138d8f7.da252",
+    "x": 4175.449111938477,
+    "y": 1104.941421508789,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "98511029.380fd"
+        "b504251b.7f7448"
       ]
     ]
   },
   {
-    "id": "98511029.380fd",
+    "id": "b504251b.7f7448",
     "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": 4315.500244140625,
-    "y": 1161,
-    "z": "4138d8f7.da252",
+    "x": 4398.566909790039,
+    "y": 1243.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1e482e0.3b3ba52"
+        "52eb8aa1.8ff274"
       ]
     ]
   },
   {
-    "id": "84ccdaef.588b08",
+    "id": "75cbb82a.35584",
     "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": 4408.5,
-    "y": 1205,
-    "z": "4138d8f7.da252",
+    "x": 4491.566665649414,
+    "y": 1287.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cee16453.63cf3",
+    "id": "3ab9a413.979aa4",
     "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": 4409.5,
-    "y": 1313,
-    "z": "4138d8f7.da252",
+    "x": 4492.566665649414,
+    "y": 1395.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d2b67ee9.016d4",
+    "id": "b9ee3c01.a1e29",
     "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": 4410.5,
-    "y": 1262,
-    "z": "4138d8f7.da252",
+    "x": 4493.566665649414,
+    "y": 1344.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "70c360c1.95da08",
+    "id": "658c69d5.ac8cf",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4408.6171875,
-    "y": 1401.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4491.683853149414,
+    "y": 1483.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8b810a1.45408f8",
-        "389752e1.54c2be",
-        "e0be029e.19d278"
+        "aadf2b0a.6db3d",
+        "61bc8b6e.22a73c",
+        "30cdefe5.b26318"
       ]
     ]
   },
   {
-    "id": "8b810a1.45408f8",
+    "id": "aadf2b0a.6db3d",
     "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": 4623.6171875,
-    "y": 1363.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4706.683853149414,
+    "y": 1445.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "389752e1.54c2be",
+    "id": "61bc8b6e.22a73c",
     "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": 4620.6171875,
-    "y": 1402.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4703.683853149414,
+    "y": 1484.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "38942ae1.d34c76"
+        "fd577e5f.db1ba"
       ]
     ]
   },
   {
-    "id": "e0be029e.19d278",
+    "id": "30cdefe5.b26318",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4576.1171875,
-    "y": 1444.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4659.183853149414,
+    "y": 1526.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "38942ae1.d34c76",
+    "id": "fd577e5f.db1ba",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4801.1171875,
-    "y": 1401.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4884.183853149414,
+    "y": 1483.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "418b10aa.3bf41"
+        "fa2d5efd.88ba08"
       ]
     ]
   },
   {
-    "id": "28737ab1.66c06e",
+    "id": "ded6fafe.4074f8",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4713.500244140625,
-    "y": 1165,
-    "z": "4138d8f7.da252",
+    "x": 4796.566909790039,
+    "y": 1247.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "813fb276.a89d38"
+        "afabdc9f.6d39f8"
       ]
     ]
   },
   {
-    "id": "813fb276.a89d38",
+    "id": "afabdc9f.6d39f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4890.500244140625,
-    "y": 1157,
-    "z": "4138d8f7.da252",
+    "x": 4973.566909790039,
+    "y": 1239.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5ba45898.1ae6d8",
-        "82500988.df7418"
+        "d564a26c.9a8558",
+        "3ff41e19.f0e01a"
       ]
     ]
   },
   {
-    "id": "1e482e0.3b3ba52",
+    "id": "52eb8aa1.8ff274",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4510.500244140625,
-    "y": 1161,
-    "z": "4138d8f7.da252",
+    "x": 4593.566909790039,
+    "y": 1243.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "28737ab1.66c06e",
-        "431c2963.374ce8"
+        "ded6fafe.4074f8",
+        "f56e57c9.6506a8"
       ]
     ]
   },
   {
-    "id": "431c2963.374ce8",
+    "id": "f56e57c9.6506a8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4579.500244140625,
-    "y": 1235,
-    "z": "4138d8f7.da252",
+    "x": 4662.566909790039,
+    "y": 1317.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d3fb7afe.dba838"
+        "f21dcf5d.336178"
       ]
     ]
   },
   {
-    "id": "d3fb7afe.dba838",
+    "id": "f21dcf5d.336178",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4775.500244140625,
-    "y": 1235,
-    "z": "4138d8f7.da252",
+    "x": 4858.566909790039,
+    "y": 1317.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "40663368.ea789c"
+        "132ca45a.eb5e34"
       ]
     ]
   },
   {
-    "id": "418b10aa.3bf41",
+    "id": "fa2d5efd.88ba08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4959.1171875,
-    "y": 1401.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 5042.183853149414,
+    "y": 1483.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ec468881.ecbf18"
+        "b951f264.559ce"
       ]
     ]
   },
   {
-    "id": "ec468881.ecbf18",
+    "id": "b951f264.559ce",
     "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": 5166.1171875,
-    "y": 1401.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 5249.183853149414,
+    "y": 1483.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "82500988.df7418",
+    "id": "3ff41e19.f0e01a",
     "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": 5115.500244140625,
-    "y": 1153,
-    "z": "4138d8f7.da252",
+    "x": 5198.566909790039,
+    "y": 1235.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9dd65188.ffecf",
-        "e0664fc.7b8393",
-        "b7a2fd6c.7b7688"
+        "a40a7be5.2be498",
+        "d6b97145.3bf148",
+        "ea85892.20b4178"
       ]
     ]
   },
   {
-    "id": "5ba45898.1ae6d8",
+    "id": "d564a26c.9a8558",
     "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": 5145.500244140625,
-    "y": 1101,
-    "z": "4138d8f7.da252",
+    "x": 5228.566909790039,
+    "y": 1183.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9dd65188.ffecf",
+    "id": "a40a7be5.2be498",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5325.500244140625,
-    "y": 1144,
-    "z": "4138d8f7.da252",
+    "x": 5408.566909790039,
+    "y": 1226.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2d529b4.18963e4"
+        "d68ba68a.be89b8"
       ]
     ]
   },
   {
-    "id": "e0664fc.7b8393",
+    "id": "d6b97145.3bf148",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5317.500244140625,
-    "y": 1199,
-    "z": "4138d8f7.da252",
+    "x": 5400.566909790039,
+    "y": 1281.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3aa5c8f4.350c08"
+        "7c894f76.5a638"
       ]
     ]
   },
   {
-    "id": "b7a2fd6c.7b7688",
+    "id": "ea85892.20b4178",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5322.500244140625,
-    "y": 1256,
-    "z": "4138d8f7.da252",
+    "x": 5405.566909790039,
+    "y": 1338.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2908da09.77d2fe"
+        "d37deda4.10b24"
       ]
     ]
   },
   {
-    "id": "2908da09.77d2fe",
+    "id": "d37deda4.10b24",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5474.500244140625,
-    "y": 1257,
-    "z": "4138d8f7.da252",
+    "x": 5557.566909790039,
+    "y": 1339.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3aa5c8f4.350c08",
+    "id": "7c894f76.5a638",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5485.500244140625,
-    "y": 1202,
-    "z": "4138d8f7.da252",
+    "x": 5568.566909790039,
+    "y": 1284.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2d529b4.18963e4",
+    "id": "d68ba68a.be89b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5469.882568359375,
-    "y": 1141.6556701660156,
-    "z": "4138d8f7.da252",
+    "x": 5552.949234008789,
+    "y": 1223.941421508789,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e508aa99.ed11b8"
+        "ff0f9afc.082318"
       ]
     ]
   },
   {
-    "id": "40663368.ea789c",
+    "id": "132ca45a.eb5e34",
     "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": 5038.500244140625,
-    "y": 1238,
-    "z": "4138d8f7.da252",
+    "x": 5121.566909790039,
+    "y": 1320.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e508aa99.ed11b8",
+    "id": "ff0f9afc.082318",
     "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": 5656.500244140625,
-    "y": 1138,
-    "z": "4138d8f7.da252",
+    "x": 5739.566909790039,
+    "y": 1220.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e66147a6.9621b",
+    "id": "c100f1cf.959b9",
     "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": 4297.49951171875,
-    "y": 373,
-    "z": "4138d8f7.da252",
+    "x": 4380.566177368164,
+    "y": 455.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7411318a.e1b958",
+    "id": "476d7cc2.2b9e3c",
     "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": 4288.49951171875,
-    "y": 471,
-    "z": "4138d8f7.da252",
+    "x": 4371.566177368164,
+    "y": 553.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "62760f41.c93a2",
+    "id": "2bc1e64e.d59032",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4122.49951171875,
-    "y": 379,
-    "z": "4138d8f7.da252",
+    "x": 4205.566177368164,
+    "y": 461.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "92f3b868.34ce6",
-        "e66147a6.9621b"
+        "fcdd9b76.8fa5f8",
+        "c100f1cf.959b9"
       ]
     ]
   },
   {
-    "id": "273e3fee.2bc13",
+    "id": "453522b8.5dbac4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4128.49951171875,
-    "y": 443,
-    "z": "4138d8f7.da252",
+    "x": 4211.566177368164,
+    "y": 525.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b6002239.68b828",
-        "7411318a.e1b958"
+        "a44710c1.f4b4c8",
+        "476d7cc2.2b9e3c"
       ]
     ]
   },
   {
-    "id": "244a1c4c.c64574",
+    "id": "f5a4f507.86b44",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4142.499267578125,
-    "y": 607,
-    "z": "4138d8f7.da252",
+    "x": 4225.565933227539,
+    "y": 689.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "55137534.cd97cc",
-        "94e7efd7.f5ec88"
+        "5b86250b.1183b4",
+        "ee4f808.01bcf8"
       ]
     ]
   },
   {
-    "id": "f48105e4.f03428",
+    "id": "8148cd30.75333",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4145.499267578125,
-    "y": 660,
-    "z": "4138d8f7.da252",
+    "x": 4228.565933227539,
+    "y": 742.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ba173e3c.d3cf48",
-        "9c20a9f9.7c2ff"
+        "154b4953.ab9fcf",
+        "f5de4dab.b0e37"
       ]
     ]
   },
   {
-    "id": "94e7efd7.f5ec88",
+    "id": "ee4f808.01bcf8",
     "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": 4364.499267578125,
-    "y": 674,
-    "z": "4138d8f7.da252",
+    "x": 4447.565933227539,
+    "y": 756.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9c20a9f9.7c2ff",
+    "id": "f5de4dab.b0e37",
     "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": 4367.499267578125,
-    "y": 765,
-    "z": "4138d8f7.da252",
+    "x": 4450.565933227539,
+    "y": 847.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "124feda4.be759a",
+    "id": "fba24b6a.44ade",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3523.5,
-    "y": 1711,
-    "z": "4138d8f7.da252",
+    "x": 3606.566665649414,
+    "y": 1793.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e1f69d4c.5b8868",
-        "d4ae5d82.aab8b"
+        "6ab1e648.0c2108",
+        "e98d774e.c7639"
       ]
     ]
   },
   {
-    "id": "7a356795.78dec",
+    "id": "e055a781.15033",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3350.83349609375,
-    "y": 1712,
-    "z": "4138d8f7.da252",
+    "x": 3433.900161743164,
+    "y": 1794.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "124feda4.be759a"
+        "fba24b6a.44ade"
       ]
     ]
   },
   {
-    "id": "c62c11ee.d3432",
+    "id": "33450ab2.d72e86",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3360.324462890625,
-    "y": 1754.5740356445312,
-    "z": "4138d8f7.da252",
+    "x": 3443.391128540039,
+    "y": 1836.8597869873047,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4d29ec31.00d144"
+        "279c15e9.8df2d2"
       ]
     ]
   },
   {
-    "id": "fa667208.2a7ec",
+    "id": "14684e53.bc0682",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3348.83349609375,
-    "y": 1801,
-    "z": "4138d8f7.da252",
+    "x": 3431.900161743164,
+    "y": 1883.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "577a09e9.8378d8"
+        "7cf32ea0.24f2e8"
       ]
     ]
   },
   {
-    "id": "4d29ec31.00d144",
+    "id": "279c15e9.8df2d2",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3513.8958740234375,
-    "y": 1757.8597717285156,
-    "z": "4138d8f7.da252",
+    "x": 3596.9625396728516,
+    "y": 1840.145523071289,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "577a09e9.8378d8",
+    "id": "7cf32ea0.24f2e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3517.83349609375,
-    "y": 1802,
-    "z": "4138d8f7.da252",
+    "x": 3600.900161743164,
+    "y": 1884.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e1f69d4c.5b8868",
+    "id": "6ab1e648.0c2108",
     "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": 3809.83349609375,
-    "y": 1715.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3892.900161743164,
+    "y": 1797.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "67e03e9f.e657f8",
-        "8f6dd9a8.907078"
+        "daabf3e5.97bed8",
+        "1e7b26c7.e7a121"
       ]
     ]
   },
   {
-    "id": "8f6dd9a8.907078",
+    "id": "1e7b26c7.e7a121",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4032.83349609375,
-    "y": 1670.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4115.900161743164,
+    "y": 1752.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9d5c402b.afbc18"
+        "acfb9237.1cd6c8"
       ]
     ]
   },
   {
-    "id": "67e03e9f.e657f8",
+    "id": "daabf3e5.97bed8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4034.83349609375,
-    "y": 1734.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4117.900161743164,
+    "y": 1816.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b1dc0c2e.2db02"
+        "2bdd8bed.c7bcd4"
       ]
     ]
   },
   {
-    "id": "b1dc0c2e.2db02",
+    "id": "2bdd8bed.c7bcd4",
     "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": 4193.83349609375,
-    "y": 1753.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4276.900161743164,
+    "y": 1835.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9d5c402b.afbc18",
+    "id": "acfb9237.1cd6c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4197.83349609375,
-    "y": 1667.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4280.900161743164,
+    "y": 1749.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "eb823b6e.5b1b68",
-        "d1229eee.7607f"
+        "26977aa5.25dd2e",
+        "72fafff.27e4d"
       ]
     ]
   },
   {
-    "id": "ec67f0f.b56539",
+    "id": "da60761c.d9f04",
     "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": 3122.83349609375,
-    "y": 1747,
-    "z": "4138d8f7.da252",
+    "x": 3205.900161743164,
+    "y": 1829.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7a356795.78dec",
-        "c62c11ee.d3432",
-        "fa667208.2a7ec"
+        "e055a781.15033",
+        "33450ab2.d72e86",
+        "14684e53.bc0682"
       ]
     ]
   },
   {
-    "id": "ef79491a.ef1ed",
+    "id": "4b7ae9f1.8aec68",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3083.83349609375,
-    "y": 1691,
-    "z": "4138d8f7.da252",
+    "x": 3166.900161743164,
+    "y": 1773.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "363ba934.edbd4e",
+    "id": "5f587418.c46734",
     "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": 3135.83349609375,
-    "y": 1493,
-    "z": "4138d8f7.da252",
+    "x": 3218.900161743164,
+    "y": 1575.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fab0a5fc.8009e8",
-        "1a41312c.3b3677"
+        "f9cab6f8.ebc12",
+        "1ca010c1.fd862f"
       ]
     ]
   },
   {
-    "id": "1a41312c.3b3677",
+    "id": "1ca010c1.fd862f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3358.83349609375,
-    "y": 1479,
-    "z": "4138d8f7.da252",
+    "x": 3441.900161743164,
+    "y": 1561.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "41d39e09.02c3d8"
+        "c0d41dc2.2e9ce8"
       ]
     ]
   },
   {
-    "id": "fab0a5fc.8009e8",
+    "id": "f9cab6f8.ebc12",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3360.83349609375,
-    "y": 1512,
-    "z": "4138d8f7.da252",
+    "x": 3443.900161743164,
+    "y": 1594.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "31a06a0b.93432e"
+        "3ccca278.68559e"
       ]
     ]
   },
   {
-    "id": "31a06a0b.93432e",
+    "id": "3ccca278.68559e",
     "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": 3503.83349609375,
-    "y": 1509,
-    "z": "4138d8f7.da252",
+    "x": 3586.900161743164,
+    "y": 1591.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "41d39e09.02c3d8",
+    "id": "c0d41dc2.2e9ce8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3506.83349609375,
-    "y": 1472,
-    "z": "4138d8f7.da252",
+    "x": 3589.900161743164,
+    "y": 1554.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "12fe71d9.7bf9be",
-        "c47ac813.f199b8"
+        "c99a0449.e56c2",
+        "7083ce51.93a92"
       ]
     ]
   },
   {
-    "id": "12fe71d9.7bf9be",
+    "id": "c99a0449.e56c2",
     "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": 3700.83349609375,
-    "y": 1475.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3783.900161743164,
+    "y": 1557.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d4ae5d82.aab8b",
+    "id": "e98d774e.c7639",
     "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": 3753.83349609375,
-    "y": 1834,
-    "z": "4138d8f7.da252",
+    "x": 3836.900161743164,
+    "y": 1916.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7b8dd371.aa4964"
+        "fd084df8.e98c58"
       ]
     ]
   },
   {
-    "id": "7b8dd371.aa4964",
+    "id": "fd084df8.e98c58",
     "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": 3959.83349609375,
-    "y": 1834,
-    "z": "4138d8f7.da252",
+    "x": 4042.900161743164,
+    "y": 1916.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e78bd2af.32742"
+        "6cb7488a.a222b"
       ]
     ]
   },
   {
-    "id": "e78bd2af.32742",
+    "id": "6cb7488a.a222b",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4177.119140625,
-    "y": 1832.82177734375,
-    "z": "4138d8f7.da252",
+    "x": 4260.185806274414,
+    "y": 1915.1075286865234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "231ad36e.3e7974"
+        "350b3e58.c792ea"
       ]
     ]
   },
   {
-    "id": "c47ac813.f199b8",
+    "id": "7083ce51.93a92",
     "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": 3722.83349609375,
-    "y": 1543.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3805.900161743164,
+    "y": 1625.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "14953bcb.0f686c",
-        "5a2f3f75.0fbf6",
-        "61553bc7.07748c"
+        "5d1bde7f.a2e988",
+        "568d456e.886424",
+        "4559cac2.72065c"
       ]
     ]
   },
   {
-    "id": "14953bcb.0f686c",
+    "id": "5d1bde7f.a2e988",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3918.3336181640625,
-    "y": 1495.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4001.4002838134766,
+    "y": 1577.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e9311021.d720e8"
+        "7231501f.55645"
       ]
     ]
   },
   {
-    "id": "5a2f3f75.0fbf6",
+    "id": "568d456e.886424",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3910.3336181640625,
-    "y": 1550.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3993.4002838134766,
+    "y": 1632.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4fbd5f1f.bd6168"
+        "1fe97a53.6160f6"
       ]
     ]
   },
   {
-    "id": "61553bc7.07748c",
+    "id": "4559cac2.72065c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3915.3336181640625,
-    "y": 1607.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3998.4002838134766,
+    "y": 1689.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ccee2aed.1d2c48"
+        "c16f7b5a.3ed008"
       ]
     ]
   },
   {
-    "id": "ccee2aed.1d2c48",
+    "id": "c16f7b5a.3ed008",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4067.3336181640625,
-    "y": 1608.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4150.400283813477,
+    "y": 1690.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "4fbd5f1f.bd6168",
+    "id": "1fe97a53.6160f6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4078.3336181640625,
-    "y": 1553.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4161.400283813477,
+    "y": 1635.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e9311021.d720e8",
+    "id": "7231501f.55645",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4062.7159423828125,
-    "y": 1492.6557922363281,
-    "z": "4138d8f7.da252",
+    "x": 4145.782608032227,
+    "y": 1574.9415435791016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "12595c91.b718eb"
+        "c3bee3fa.d3a9e"
       ]
     ]
   },
   {
-    "id": "eb823b6e.5b1b68",
+    "id": "26977aa5.25dd2e",
     "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": 4367.83349609375,
-    "y": 1628.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4450.900161743164,
+    "y": 1710.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d1229eee.7607f",
+    "id": "72fafff.27e4d",
     "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": 4368.83349609375,
-    "y": 1733.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4451.900161743164,
+    "y": 1815.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8d0a9501.e59f28",
+    "id": "3c2418c7.4572c8",
     "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": 4363.83349609375,
-    "y": 1682.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4446.900161743164,
+    "y": 1764.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "231ad36e.3e7974",
+    "id": "350b3e58.c792ea",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4383.95068359375,
-    "y": 1822.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4467.017349243164,
+    "y": 1904.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "16f2e433.3291b4",
-        "80f33246.16c218",
-        "51170c35.40a6bc"
+        "5da8c5d3.b9f55c",
+        "1242abaf.e56384",
+        "ed6b22ec.e3cd3"
       ]
     ]
   },
   {
-    "id": "16f2e433.3291b4",
+    "id": "5da8c5d3.b9f55c",
     "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": 4598.95068359375,
-    "y": 1784.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4682.017349243164,
+    "y": 1866.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "80f33246.16c218",
+    "id": "1242abaf.e56384",
     "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": 4595.95068359375,
-    "y": 1823.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4679.017349243164,
+    "y": 1905.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ec1220f2.c0002"
+        "44aa2b45.5157d4"
       ]
     ]
   },
   {
-    "id": "51170c35.40a6bc",
+    "id": "ed6b22ec.e3cd3",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4551.45068359375,
-    "y": 1865.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4634.517349243164,
+    "y": 1947.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ec1220f2.c0002",
+    "id": "44aa2b45.5157d4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4776.45068359375,
-    "y": 1822.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4859.517349243164,
+    "y": 1904.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "757e93f0.7ee45c"
+        "cd8ad202.8d323"
       ]
     ]
   },
   {
-    "id": "757e93f0.7ee45c",
+    "id": "cd8ad202.8d323",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4934.45068359375,
-    "y": 1822.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 5017.517349243164,
+    "y": 1904.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c7244ae.af2a238"
+        "3d8ba8c1.7feef8"
       ]
     ]
   },
   {
-    "id": "c7244ae.af2a238",
+    "id": "3d8ba8c1.7feef8",
     "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": 5141.45068359375,
-    "y": 1822.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 5224.517349243164,
+    "y": 1904.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7e549eab.8dbb18",
+    "id": "64248373.c0f1e4",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.83349609375,
-    "y": 1511.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4727.900161743164,
+    "y": 1593.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1d3b129c.b2a675"
+        "ebf5d941.b9751"
       ]
     ]
   },
   {
-    "id": "1d3b129c.b2a675",
+    "id": "ebf5d941.b9751",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4821.83349609375,
-    "y": 1503.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4904.900161743164,
+    "y": 1585.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b6b58a8c.8e7ea8",
-        "dc3d97ac.463e28"
+        "5f21b6d8.97a7a8",
+        "a66d8cdf.7774c"
       ]
     ]
   },
   {
-    "id": "12595c91.b718eb",
+    "id": "c3bee3fa.d3a9e",
     "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": 4246.83349609375,
-    "y": 1507.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4329.900161743164,
+    "y": 1589.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a772c4a4.38145"
+        "768c4246.3384b4"
       ]
     ]
   },
   {
-    "id": "a772c4a4.38145",
+    "id": "768c4246.3384b4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4441.83349609375,
-    "y": 1507.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4524.900161743164,
+    "y": 1589.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7e549eab.8dbb18",
-        "aea7a178.f6fc4"
+        "64248373.c0f1e4",
+        "d4d1382b.4bf1a8"
       ]
     ]
   },
   {
-    "id": "dc3d97ac.463e28",
+    "id": "a66d8cdf.7774c",
     "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": 5029.83349609375,
-    "y": 1510.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5112.900161743164,
+    "y": 1592.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3bf3e082.eea5e8",
-        "58cb7d25.d2da94",
-        "d2f7fa01.93a528"
+        "798943c1.0b7f24",
+        "dbd1300d.b2d4d8",
+        "c22228e5.5f04a"
       ]
     ]
   },
   {
-    "id": "a307fd53.34615",
+    "id": "4ab59831.7b5d28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4823.83349609375,
-    "y": 1576.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4906.900161743164,
+    "y": 1658.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ca73ba2d.29c1c8"
+        "b63665cd.e9bca8"
       ]
     ]
   },
   {
-    "id": "aea7a178.f6fc4",
+    "id": "d4d1382b.4bf1a8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4646.83349609375,
-    "y": 1584.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4729.900161743164,
+    "y": 1666.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a307fd53.34615"
+        "4ab59831.7b5d28"
       ]
     ]
   },
   {
-    "id": "b6b58a8c.8e7ea8",
+    "id": "5f21b6d8.97a7a8",
     "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": 5059.83349609375,
-    "y": 1458.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5142.900161743164,
+    "y": 1540.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ca73ba2d.29c1c8",
+    "id": "b63665cd.e9bca8",
     "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": 5005.83349609375,
-    "y": 1640.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5088.900161743164,
+    "y": 1722.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3bf3e082.eea5e8",
+    "id": "798943c1.0b7f24",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5239.83349609375,
-    "y": 1501.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5322.900161743164,
+    "y": 1583.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "36f4f947.29aeae"
+        "4408e043.c54b2"
       ]
     ]
   },
   {
-    "id": "58cb7d25.d2da94",
+    "id": "dbd1300d.b2d4d8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5231.83349609375,
-    "y": 1556.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5314.900161743164,
+    "y": 1638.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b7803a75.d7ec1"
+        "90ad08da.8c4d18"
       ]
     ]
   },
   {
-    "id": "d2f7fa01.93a528",
+    "id": "c22228e5.5f04a",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5236.83349609375,
-    "y": 1613.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5319.900161743164,
+    "y": 1695.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8d6cbae8.86128"
+        "de4c591d.7f2f48"
       ]
     ]
   },
   {
-    "id": "8d6cbae8.86128",
+    "id": "de4c591d.7f2f48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5388.83349609375,
-    "y": 1614.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5471.900161743164,
+    "y": 1696.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b7803a75.d7ec1",
+    "id": "90ad08da.8c4d18",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5399.83349609375,
-    "y": 1559.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5482.900161743164,
+    "y": 1641.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "36f4f947.29aeae",
+    "id": "4408e043.c54b2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5384.2158203125,
-    "y": 1498.6557922363281,
-    "z": "4138d8f7.da252",
+    "x": 5467.282485961914,
+    "y": 1580.9415435791016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b6324aba.def4e"
+        "2133344e.893bec"
       ]
     ]
   },
   {
-    "id": "b6324aba.def4e",
+    "id": "2133344e.893bec",
     "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": 5598.83349609375,
-    "y": 1495.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5681.900161743164,
+    "y": 1577.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "631e76e1.71afc",
+    "id": "fd9bd7ab.c92bd8",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3187.5,
-    "y": 1317,
-    "z": "4138d8f7.da252",
+    "x": 3270.566665649414,
+    "y": 1399.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d1d7f338.2c48e",
+    "id": "6a9b0f1.984457",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4464.49951171875,
-    "y": 457,
-    "z": "4138d8f7.da252",
+    "x": 4547.566177368164,
+    "y": 539.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "df68ae5a.c6abe",
+    "id": "2f61d3b4.f418bc",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4532.499267578125,
-    "y": 659,
-    "z": "4138d8f7.da252",
+    "x": 4615.565933227539,
+    "y": 741.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b17f4ff2.75d93",
+    "id": "b37c5dee.6ca208",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3083.5,
-    "y": 1878,
-    "z": "4138d8f7.da252",
+    "x": 3166.566665649414,
+    "y": 1960.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8048035e.723ef",
+    "id": "1bc9df09.d67e59",
     "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": 3345.5,
-    "y": 2791,
-    "z": "4138d8f7.da252",
+    "x": 3428.566665649414,
+    "y": 2873.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d590aba5.94aa48",
+    "id": "6e895a21.1d4594",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3222.5,
-    "y": 2901,
-    "z": "4138d8f7.da252",
+    "x": 3305.566665649414,
+    "y": 2983.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "507ab41.362cbcc",
-        "63f9a6e5.2f9178"
+        "cef17f20.edf7e8",
+        "6dda4254.968224"
       ]
     ]
   },
   {
-    "id": "507ab41.362cbcc",
+    "id": "cef17f20.edf7e8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3406.5,
-    "y": 2880,
-    "z": "4138d8f7.da252",
+    "x": 3489.566665649414,
+    "y": 2962.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "28f5fd24.d628ea"
+        "d8fe6f8d.d7595"
       ]
     ]
   },
   {
-    "id": "63f9a6e5.2f9178",
+    "id": "6dda4254.968224",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2942.5,
-    "y": 4466,
-    "z": "4138d8f7.da252",
+    "x": 3025.566665649414,
+    "y": 4548.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "db2110db.2b1778"
+        "d77e7161.5348c8"
       ]
     ]
   },
   {
-    "id": "9f11b3.a8080e5",
+    "id": "300daee4.3b0352",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3453.5,
-    "y": 5051,
-    "z": "4138d8f7.da252",
+    "x": 3536.566665649414,
+    "y": 5133.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "40ac4d15.a539ec",
-        "577ac65e.4cd8e8",
-        "c33c721b.c24a68",
-        "e8ff43f0.c9213",
-        "c23415ae.23176",
-        "b27458da.77b73"
+        "318b9beb.21378c",
+        "1992e083.76e587",
+        "aaed5b46.7e8eb",
+        "c7aee100.ec3998",
+        "b969bbc7.e53528",
+        "54f08fa.71777f"
       ]
     ]
   },
   {
-    "id": "28f5fd24.d628ea",
+    "id": "d8fe6f8d.d7595",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6119.5,
-    "y": 1700,
-    "z": "4138d8f7.da252",
+    "x": 6202.566665649414,
+    "y": 1782.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4783da3c.fb84a4",
-        "bb88421.9f996c",
-        "55b1d688.471dd",
-        "31123019.0abe4",
-        "1759beb1.f3c1d1",
-        "98f705b0.6bc73",
-        "b6e856a5.c69918",
-        "277a36b1.830aba",
-        "f9e2137d.7a2d78",
-        "3298314.8dc664e",
-        "cfdca91b.21bde",
-        "a46de057.2f2f3",
-        "2c505364.e529bc",
-        "5713069a.52e6e",
-        "736cdf51.8421c8",
-        "a19bdc2c.350be8",
-        "829d6c73.aa7da8",
-        "57d8804.ea8d28",
-        "39b6682a.960bc",
-        "858f96c1.79cbc",
-        "1b0442b9.4b628d",
-        "c1546bd.e66d418"
+        "1a1f2023.50c9f8",
+        "e814ac2.6d99cd",
+        "27a9213f.e489d6",
+        "904795f3.631878",
+        "c284bcb.2b7c44",
+        "1d8604a2.381ee3",
+        "5946c797.be74d",
+        "a66844b6.e099c",
+        "37c7ecba.efaa4c",
+        "72cc1cfb.a77694",
+        "1e88893b.a079df",
+        "f9c59fe9.ee503",
+        "4573e73f.58afa8",
+        "c53261d3.0987a8",
+        "f109d109.e8eb",
+        "4c9e5bd3.54a49c",
+        "e1cb1e55.b0357",
+        "e177a7a3.e48c7",
+        "6fa889cc.c9cce",
+        "c91e3a5e.c6511",
+        "162cf27b.802c36",
+        "5a5c80f6.6318b8"
       ]
     ]
   },
   {
-    "id": "f9e2137d.7a2d78",
+    "id": "37c7ecba.efaa4c",
     "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": 6490.5,
-    "y": 1623,
-    "z": "4138d8f7.da252",
+    "x": 6573.566665649414,
+    "y": 1705.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4783da3c.fb84a4",
+    "id": "1a1f2023.50c9f8",
     "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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6444.5,
-    "y": 1721,
-    "z": "4138d8f7.da252",
+    "x": 6527.566665649414,
+    "y": 1803.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "bb88421.9f996c",
+    "id": "e814ac2.6d99cd",
     "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": 6580.5,
-    "y": 1768,
-    "z": "4138d8f7.da252",
+    "x": 6663.566665649414,
+    "y": 1850.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "a3afcd58.883878",
+    "id": "2ad7ea9.f129796",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6411.5,
-    "y": 1572,
-    "z": "4138d8f7.da252",
+    "x": 6494.566665649414,
+    "y": 1654.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "47893e3d.7abf68",
+    "id": "942a9804.0c79c",
     "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": 6907.5,
-    "y": 2308,
-    "z": "4138d8f7.da252",
+    "x": 6990.566665649414,
+    "y": 2390.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "55b1d688.471dd",
+    "id": "27a9213f.e489d6",
     "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": 6471.5,
-    "y": 2347,
-    "z": "4138d8f7.da252",
+    "x": 6554.566665649414,
+    "y": 2429.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "31123019.0abe4",
+    "id": "904795f3.631878",
     "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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6419.5,
-    "y": 2398,
-    "z": "4138d8f7.da252",
+    "x": 6502.566665649414,
+    "y": 2480.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1759beb1.f3c1d1",
+    "id": "c284bcb.2b7c44",
     "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": 6555.5,
-    "y": 2445,
-    "z": "4138d8f7.da252",
+    "x": 6638.566665649414,
+    "y": 2527.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "71216be9.ff79f4",
+    "id": "887b2dbb.8eb65",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6412.5,
-    "y": 2307,
-    "z": "4138d8f7.da252",
+    "x": 6495.566665649414,
+    "y": 2389.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3446875.4213df8",
+    "id": "8252fd61.bfc208",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6842.5,
-    "y": 2504,
-    "z": "4138d8f7.da252",
+    "x": 6925.566665649414,
+    "y": 2586.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "98f705b0.6bc73",
+    "id": "1d8604a2.381ee3",
     "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": 6433.5,
-    "y": 2551,
-    "z": "4138d8f7.da252",
+    "x": 6516.566665649414,
+    "y": 2633.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4cd47e4a.423aa8",
-        "dbf8ee5e.1c40a8",
-        "e7f2720f.fd9208"
+        "68a11957.d1e54",
+        "98ce32f4.8ab98",
+        "ceda9f28.da773"
       ]
     ]
   },
   {
-    "id": "4cd47e4a.423aa8",
+    "id": "68a11957.d1e54",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6680.5,
-    "y": 2505,
-    "z": "4138d8f7.da252",
+    "x": 6763.566665649414,
+    "y": 2587.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3446875.4213df8"
+        "8252fd61.bfc208"
       ]
     ]
   },
   {
-    "id": "dbf8ee5e.1c40a8",
+    "id": "98ce32f4.8ab98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6680.990966796875,
-    "y": 2550.5740356445312,
-    "z": "4138d8f7.da252",
+    "x": 6764.057632446289,
+    "y": 2632.8597869873047,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5c2d61a6.b888d8"
+        "9afbaf66.fb0d68"
       ]
     ]
   },
   {
-    "id": "e7f2720f.fd9208",
+    "id": "ceda9f28.da773",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6678.5,
-    "y": 2594,
-    "z": "4138d8f7.da252",
+    "x": 6761.566665649414,
+    "y": 2676.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7deb6a39.1c780c"
+        "3e284ec9.e9b522"
       ]
     ]
   },
   {
-    "id": "5c2d61a6.b888d8",
+    "id": "9afbaf66.fb0d68",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 6843.5623779296875,
-    "y": 2550.8597717285156,
-    "z": "4138d8f7.da252",
+    "x": 6926.629043579102,
+    "y": 2633.145523071289,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7deb6a39.1c780c",
+    "id": "3e284ec9.e9b522",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 6847.5,
-    "y": 2595,
-    "z": "4138d8f7.da252",
+    "x": 6930.566665649414,
+    "y": 2677.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "736cdf51.8421c8",
+    "id": "f109d109.e8eb",
     "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": 6487.5,
-    "y": 2867,
-    "z": "4138d8f7.da252",
+    "x": 6570.566665649414,
+    "y": 2949.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "a19bdc2c.350be8",
+    "id": "4c9e5bd3.54a49c",
     "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": 6490.5,
-    "y": 2912,
-    "z": "4138d8f7.da252",
+    "x": 6573.566665649414,
+    "y": 2994.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "57d8804.ea8d28",
+    "id": "e177a7a3.e48c7",
     "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": 6482.5,
-    "y": 2666,
-    "z": "4138d8f7.da252",
+    "x": 6565.566665649414,
+    "y": 2748.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "39b6682a.960bc",
+    "id": "6fa889cc.c9cce",
     "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": 6484.5,
-    "y": 2713,
-    "z": "4138d8f7.da252",
+    "x": 6567.566665649414,
+    "y": 2795.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "35de923d.3dc786",
+    "id": "5dea74d5.1b4aa4",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6403.5,
-    "y": 2820,
-    "z": "4138d8f7.da252",
+    "x": 6486.566665649414,
+    "y": 2902.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "64b6242c.0fc1a4",
+    "id": "3dd8554.be5c5aa",
     "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": 4403.500244140625,
-    "y": 5213,
-    "z": "4138d8f7.da252",
+    "x": 4486.566909790039,
+    "y": 5295.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "40ac4d15.a539ec",
+    "id": "318b9beb.21378c",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3668.5,
-    "y": 5032,
-    "z": "4138d8f7.da252",
+    "x": 3751.566665649414,
+    "y": 5114.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "243fddd4.c99fc2",
-        "ed2a1041.39364"
+        "37cde52f.e57ab2",
+        "655366f1.7fdc7"
       ]
     ]
   },
   {
-    "id": "ed2a1041.39364",
+    "id": "655366f1.7fdc7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3840.5,
-    "y": 5029,
-    "z": "4138d8f7.da252",
+    "x": 3923.566665649414,
+    "y": 5111.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f749d2c9.24f0b"
+        "828433f7.b11a2"
       ]
     ]
   },
   {
-    "id": "243fddd4.c99fc2",
+    "id": "37cde52f.e57ab2",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3792.5,
-    "y": 5876,
-    "z": "4138d8f7.da252",
+    "x": 3875.566665649414,
+    "y": 5958.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a2f25d49.46cd88"
+        "e6235853.96452"
       ]
     ]
   },
   {
-    "id": "54d55fbb.9ecd9",
+    "id": "4ddc3818.58ee88",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3853.5,
-    "y": 4999,
-    "z": "4138d8f7.da252",
+    "x": 3936.566665649414,
+    "y": 5081.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2bf8aac8.9b318e",
+    "id": "bc0b6e25.72063",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3863.5,
-    "y": 5834,
-    "z": "4138d8f7.da252",
+    "x": 3946.566665649414,
+    "y": 5916.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b6e856a5.c69918",
+    "id": "5946c797.be74d",
     "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": 6489.5,
-    "y": 3046,
-    "z": "4138d8f7.da252",
+    "x": 6572.566665649414,
+    "y": 3128.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f749d2c9.24f0b",
+    "id": "828433f7.b11a2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4016.5,
-    "y": 5031,
-    "z": "4138d8f7.da252",
+    "x": 4099.566665649414,
+    "y": 5113.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b146a69c.13b518",
-        "436ccdfb.1e8f5c",
-        "124f51e3.777566",
-        "91ebdf82.9979e",
-        "3da01b2d.c332ec",
-        "59b34ffd.7f824",
-        "64b6242c.0fc1a4",
-        "cb7342b9.a9c168",
-        "7a7c44d8.30aa44"
+        "ec3ed36f.33f8e",
+        "2da9765.20a818a",
+        "583fc579.afbe3c",
+        "92f3ada6.6626b",
+        "d0f2c5e0.41cd1",
+        "80308a85.281f5",
+        "3dd8554.be5c5aa",
+        "b727caf7.37ccd",
+        "9d76b5ce.608a08"
       ]
     ]
   },
   {
-    "id": "f96e508.5132a3",
+    "id": "730f8b58.f71bb4",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5460.499755859375,
-    "y": 4956,
-    "z": "4138d8f7.da252",
+    "x": 5543.566421508789,
+    "y": 5038.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b146a69c.13b518",
+    "id": "ec3ed36f.33f8e",
     "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": 4262.500244140625,
-    "y": 5712,
-    "z": "4138d8f7.da252",
+    "x": 4345.566909790039,
+    "y": 5794.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "277a36b1.830aba",
+    "id": "a66844b6.e099c",
     "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": 6496.5,
-    "y": 1962,
-    "z": "4138d8f7.da252",
+    "x": 6579.566665649414,
+    "y": 2044.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "467249d9.2faa78",
+    "id": "723517cc.862aa8",
     "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": 6546.5,
-    "y": 1665,
-    "z": "4138d8f7.da252",
+    "x": 6629.566665649414,
+    "y": 1747.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3298314.8dc664e",
+    "id": "72cc1cfb.a77694",
     "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": 6493.5,
-    "y": 1253,
-    "z": "4138d8f7.da252",
+    "x": 6576.566665649414,
+    "y": 1335.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "cfdca91b.21bde",
+    "id": "1e88893b.a079df",
     "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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6441.5,
-    "y": 1301,
-    "z": "4138d8f7.da252",
+    "x": 6524.566665649414,
+    "y": 1383.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "a46de057.2f2f3",
+    "id": "f9c59fe9.ee503",
     "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": 6569.5,
-    "y": 1348,
-    "z": "4138d8f7.da252",
+    "x": 6652.566665649414,
+    "y": 1430.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f85b4c38.36c218",
+    "id": "5271815d.5f082",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6406.5,
-    "y": 1211,
-    "z": "4138d8f7.da252",
+    "x": 6489.566665649414,
+    "y": 1293.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2c505364.e529bc",
+    "id": "4573e73f.58afa8",
     "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": 6403.5,
-    "y": 1439,
-    "z": "4138d8f7.da252",
+    "x": 6486.566665649414,
+    "y": 1521.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5713069a.52e6e",
+    "id": "c53261d3.0987a8",
     "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": 6496.5,
-    "y": 1492,
-    "z": "4138d8f7.da252",
+    "x": 6579.566665649414,
+    "y": 1574.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "9a759e0c.1860c8",
+    "id": "61b6e37e.ff4414",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6387.5,
-    "y": 1395,
-    "z": "4138d8f7.da252",
+    "x": 6470.566665649414,
+    "y": 1477.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "147d7127.d8042f",
+    "id": "b4d51e76.274848",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6393.5,
-    "y": 1845,
-    "z": "4138d8f7.da252",
+    "x": 6476.566665649414,
+    "y": 1927.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "91ebdf82.9979e",
+    "id": "92f3ada6.6626b",
     "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": 4329.499755859375,
-    "y": 4964,
-    "z": "4138d8f7.da252",
+    "x": 4412.566421508789,
+    "y": 5046.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "148c6264.137e86",
+    "id": "cb8799d5.d6fa78",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4313.499755859375,
-    "y": 4920,
-    "z": "4138d8f7.da252",
+    "x": 4396.566421508789,
+    "y": 5002.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c1a606a9.56c798",
+    "id": "baf89c3.a308c6",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5060.499755859375,
-    "y": 4951,
-    "z": "4138d8f7.da252",
+    "x": 5143.566421508789,
+    "y": 5033.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "fd2b62b6.10b14",
+    "id": "6ac119cc.845568",
     "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": 5147.499755859375,
-    "y": 4993,
-    "z": "4138d8f7.da252",
+    "x": 5230.566421508789,
+    "y": 5075.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f21eb35f.395438",
+    "id": "be6577a4.990a1",
     "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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5095.499755859375,
-    "y": 5041,
-    "z": "4138d8f7.da252",
+    "x": 5178.566421508789,
+    "y": 5123.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "59f69d26.ab3de4",
+    "id": "ed1c0a9d.7a148",
     "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": 5223.499755859375,
-    "y": 5088,
-    "z": "4138d8f7.da252",
+    "x": 5306.566421508789,
+    "y": 5170.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "59b34ffd.7f824",
+    "id": "80308a85.281f5",
     "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": 4391.500244140625,
-    "y": 5255,
-    "z": "4138d8f7.da252",
+    "x": 4474.566909790039,
+    "y": 5337.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d4ad6d0.458de8",
+    "id": "43c35fa0.488f88",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4374.500244140625,
-    "y": 5317,
-    "z": "4138d8f7.da252",
+    "x": 4457.566909790039,
+    "y": 5399.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "436ccdfb.1e8f5c",
+    "id": "2da9765.20a818a",
     "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": 4485.500244140625,
-    "y": 5359,
-    "z": "4138d8f7.da252",
+    "x": 4568.566909790039,
+    "y": 5441.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "3e23ff77.47e2b",
+    "id": "f1717ef6.023738",
     "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": 4942.499755859375,
-    "y": 5530,
-    "z": "4138d8f7.da252",
+    "x": 5025.566421508789,
+    "y": 5612.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ff11fb03.980398",
+    "id": "99843e38.83dd4",
     "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": 4252.499755859375,
-    "y": 6228,
-    "z": "4138d8f7.da252",
+    "x": 4335.566421508789,
+    "y": 6310.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4e6fe55.c2f201c",
+    "id": "3c45c16a.44e536",
     "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": 4185.499755859375,
-    "y": 6182,
-    "z": "4138d8f7.da252",
+    "x": 4268.566421508789,
+    "y": 6264.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "79eda8bd.206ac",
+    "id": "ff6ff2f.c8fff1",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4134.499755859375,
-    "y": 6133,
-    "z": "4138d8f7.da252",
+    "x": 4217.566421508789,
+    "y": 6215.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2a4071b4.a3adee",
+    "id": "1431401.84d5c4",
     "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": 4917.5,
-    "y": 6339,
-    "z": "4138d8f7.da252",
+    "x": 5000.566665649414,
+    "y": 6421.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "124f51e3.777566",
+    "id": "583fc579.afbe3c",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4312.500244140625,
-    "y": 5416,
-    "z": "4138d8f7.da252",
+    "x": 4395.566909790039,
+    "y": 5498.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ce39c047.e7ad38",
-        "bd96b648.334cf8"
+        "57091b18.0fc4d4",
+        "6835f627.925db8"
       ]
     ]
   },
   {
-    "id": "ce39c047.e7ad38",
+    "id": "57091b18.0fc4d4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4523.500244140625,
-    "y": 5416,
-    "z": "4138d8f7.da252",
+    "x": 4606.566909790039,
+    "y": 5498.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "acd66ccf.e95b3"
+        "328e270e.4a59d8"
       ]
     ]
   },
   {
-    "id": "acd66ccf.e95b3",
+    "id": "328e270e.4a59d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4679.500244140625,
-    "y": 5412,
-    "z": "4138d8f7.da252",
+    "x": 4762.566909790039,
+    "y": 5494.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3e23ff77.47e2b",
-        "1f30d01.395cc3",
-        "58a0b8d5.3916c8"
+        "f1717ef6.023738",
+        "d4dec9b1.cf9de8",
+        "6712b992.157"
       ]
     ]
   },
   {
-    "id": "bd96b648.334cf8",
+    "id": "6835f627.925db8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4519.500244140625,
-    "y": 5464,
-    "z": "4138d8f7.da252",
+    "x": 4602.566909790039,
+    "y": 5546.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2c5c5163.2ee716"
+        "bc00cffe.21aeb8"
       ]
     ]
   },
   {
-    "id": "2c5c5163.2ee716",
+    "id": "bc00cffe.21aeb8",
     "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": 4667.500244140625,
-    "y": 5459,
-    "z": "4138d8f7.da252",
+    "x": 4750.566909790039,
+    "y": 5541.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8af1d85e.882ed",
+    "id": "684d6198.d250c8",
     "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": 5184.499755859375,
-    "y": 5159,
-    "z": "4138d8f7.da252",
+    "x": 5267.566421508789,
+    "y": 5241.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "cf6d7172.69b4b8",
+    "id": "ab78fc6f.8a0998",
     "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": 2351.5,
-    "y": 118,
-    "z": "4138d8f7.da252",
+    "x": 2434.566665649414,
+    "y": 200.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "326038f4.f291a",
+    "id": "1e0dcc9a.c7d15b",
     "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": 2285.5,
-    "y": 154,
-    "z": "4138d8f7.da252",
+    "x": 2368.566665649414,
+    "y": 236.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2bce3640.48de4a",
+    "id": "7f3a574e.dafd48",
     "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": 2470.5,
-    "y": 81,
-    "z": "4138d8f7.da252",
+    "x": 2553.566665649414,
+    "y": 163.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7170f2f2.71fadc",
+    "id": "131a46fd.415b69",
     "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": 4219.499755859375,
-    "y": 6294,
-    "z": "4138d8f7.da252",
+    "x": 4302.566421508789,
+    "y": 6376.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2402858c.2e7c4a",
+    "id": "bd42462a.156a88",
     "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": 4352.499755859375,
-    "y": 6342,
-    "z": "4138d8f7.da252",
+    "x": 4435.566421508789,
+    "y": 6424.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "2fcf2035.98d3c",
+    "id": "28f03df7.2bcada",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4171.499755859375,
-    "y": 6400,
-    "z": "4138d8f7.da252",
+    "x": 4254.566421508789,
+    "y": 6482.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c3761e40.b25338",
-        "ce543bbd.a7b0f8"
+        "81c1148f.4cc3d8",
+        "1bb40996.4838a6"
       ]
     ]
   },
   {
-    "id": "c3761e40.b25338",
+    "id": "81c1148f.4cc3d8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4364.499755859375,
-    "y": 6401,
-    "z": "4138d8f7.da252",
+    "x": 4447.566421508789,
+    "y": 6483.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "70442e7d.0be548"
+        "5632e5bc.008fd4"
       ]
     ]
   },
   {
-    "id": "70442e7d.0be548",
+    "id": "5632e5bc.008fd4",
     "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": 4520.499755859375,
-    "y": 6398,
-    "z": "4138d8f7.da252",
+    "x": 4603.566421508789,
+    "y": 6480.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ce543bbd.a7b0f8",
+    "id": "1bb40996.4838a6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4368.499755859375,
-    "y": 6445,
-    "z": "4138d8f7.da252",
+    "x": 4451.566421508789,
+    "y": 6527.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "47cf8ce2.24939c"
+        "2400d348.1454e4"
       ]
     ]
   },
   {
-    "id": "47cf8ce2.24939c",
+    "id": "2400d348.1454e4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4507.499755859375,
-    "y": 6440,
-    "z": "4138d8f7.da252",
+    "x": 4590.566421508789,
+    "y": 6522.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2a4071b4.a3adee",
-        "ca3ef968.6dda08",
-        "9655804c.a8367",
-        "94748373.e9e958",
-        "a0da2cb6.f8de08",
-        "5744849a.cc54ac",
-        "4e084c4a.411b3c",
-        "9bb50a9.812c6f8",
-        "5a3abbf9.5bd584",
-        "860af8d0.fc96e8",
-        "f942597e.1aa18",
-        "fc4aa587.17d69",
-        "afa717d0.25e7a8"
+        "1431401.84d5c4",
+        "cfbbd347.67bf98",
+        "4f0e8fb5.8e798",
+        "e1e51f2c.3838b",
+        "38f3723d.fc373e",
+        "556b17f.21493e8",
+        "72f64404.57e414",
+        "4c65c6ba.14ece",
+        "72bff017.143e6",
+        "debab96e.421598",
+        "e11abdc.71e19c",
+        "6a0cb0e4.5bec78",
+        "811fcd41.48413"
       ]
     ]
   },
   {
-    "id": "4e084c4a.411b3c",
+    "id": "72f64404.57e414",
     "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": 4704.499755859375,
-    "y": 7119,
-    "z": "4138d8f7.da252",
+    "x": 4787.566421508789,
+    "y": 7201.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b531f7cf.459858",
-        "14585404.95eb44",
-        "91bd86e2.073e5"
+        "f17dbf11.a99f78",
+        "840879a8.da7ac",
+        "ff33cdc7.aad138"
       ]
     ]
   },
   {
-    "id": "b531f7cf.459858",
+    "id": "f17dbf11.a99f78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4899.499969482422,
-    "y": 7094.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4982.566635131836,
+    "y": 7177.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7a861e6f.3259d"
+        "9d7f152f.0d13"
       ]
     ]
   },
   {
-    "id": "14585404.95eb44",
+    "id": "840879a8.da7ac",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4891.990936279297,
-    "y": 7131.574005126953,
-    "z": "4138d8f7.da252",
+    "x": 4975.057601928711,
+    "y": 7213.859756469727,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7b4d1550.4d39b4"
+        "722c6254.b53dd4"
       ]
     ]
   },
   {
-    "id": "91bd86e2.073e5",
+    "id": "ff33cdc7.aad138",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4889.499969482422,
-    "y": 7174.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4972.566635131836,
+    "y": 7257.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c9793222.0d19b8"
+        "2dfdab6e.e9f304"
       ]
     ]
   },
   {
-    "id": "7a861e6f.3259d",
+    "id": "9d7f152f.0d13",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5071.499969482422,
-    "y": 7092.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5154.566635131836,
+    "y": 7175.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "96392b44.e759e"
+        "f4de49b1.9e78c8"
       ]
     ]
   },
   {
-    "id": "7b4d1550.4d39b4",
+    "id": "722c6254.b53dd4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5054.562347412109,
-    "y": 7131.8597412109375,
-    "z": "4138d8f7.da252",
+    "x": 5137.629013061523,
+    "y": 7214.145492553711,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c9793222.0d19b8",
+    "id": "2dfdab6e.e9f304",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5056.499969482422,
-    "y": 7173.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5139.566635131836,
+    "y": 7256.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "96392b44.e759e",
+    "id": "f4de49b1.9e78c8",
     "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": 5312.499755859375,
-    "y": 7127,
-    "z": "4138d8f7.da252",
+    "x": 5395.566421508789,
+    "y": 7209.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dcbe395c.2f719"
+        "c3d85a4.1f615a8"
       ]
     ]
   },
   {
-    "id": "dcbe395c.2f719",
+    "id": "c3d85a4.1f615a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5549.499755859375,
-    "y": 7123,
-    "z": "4138d8f7.da252",
+    "x": 5632.566421508789,
+    "y": 7205.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d5739a70.ba04c"
+        "f610bb15.d46c3"
       ]
     ]
   },
   {
-    "id": "6bd2c51b.a65de4",
+    "id": "3165802b.467878",
     "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": 5816.499755859375,
-    "y": 7089,
-    "z": "4138d8f7.da252",
+    "x": 5899.566421508789,
+    "y": 7171.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c0446363.1c2dd",
-        "c5d80881.fdd1f"
+        "fa2a5991.1b9ca",
+        "bf56d405.cdd208"
       ]
     ]
   },
   {
-    "id": "c0446363.1c2dd",
+    "id": "fa2a5991.1b9ca",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5997.499755859375,
-    "y": 7115,
-    "z": "4138d8f7.da252",
+    "x": 6080.566421508789,
+    "y": 7197.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d5739a70.ba04c"
+        "f610bb15.d46c3"
       ]
     ]
   },
   {
-    "id": "c5d80881.fdd1f",
+    "id": "bf56d405.cdd208",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5996.499755859375,
-    "y": 7068,
-    "z": "4138d8f7.da252",
+    "x": 6079.566421508789,
+    "y": 7150.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5739a70.ba04c",
+    "id": "f610bb15.d46c3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4513.499969482422,
-    "y": 7262.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4596.566635131836,
+    "y": 7345.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "edcf20b8.e61748"
+        "c29275cf.22abd8"
       ]
     ]
   },
   {
-    "id": "4fecf72f.04fbc",
+    "id": "424309da.5dae7",
     "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": 5589.499755859375,
-    "y": 7295,
-    "z": "4138d8f7.da252",
+    "x": 5672.566421508789,
+    "y": 7377.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c1969b50.1f4a7",
+    "id": "37faaddd.0a2fe2",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4802.499969482422,
-    "y": 7030.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4885.566635131836,
+    "y": 7113.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "5744849a.cc54ac",
+    "id": "556b17f.21493e8",
     "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": 4686.499755859375,
-    "y": 6915,
-    "z": "4138d8f7.da252",
+    "x": 4769.566421508789,
+    "y": 6997.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3d6f4e35.1dbdf2",
+    "id": "bbd937d0.174fa8",
     "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": 5031.499755859375,
-    "y": 6746,
-    "z": "4138d8f7.da252",
+    "x": 5114.566421508789,
+    "y": 6828.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1b824e77.058e42"
+        "74d7f148.c83f28"
       ]
     ]
   },
   {
-    "id": "1b824e77.058e42",
+    "id": "74d7f148.c83f28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5251.499755859375,
-    "y": 6752,
-    "z": "4138d8f7.da252",
+    "x": 5334.566421508789,
+    "y": 6834.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2ab4f0b.650811"
+        "e33037d6.9207c"
       ]
     ]
   },
   {
-    "id": "2ab4f0b.650811",
+    "id": "e33037d6.9207c",
     "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": 5436.499755859375,
-    "y": 6751,
-    "z": "4138d8f7.da252",
+    "x": 5519.566421508789,
+    "y": 6833.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a23d4d14.87325"
+        "ff68f8c5.ac398"
       ]
     ]
   },
   {
-    "id": "a23d4d14.87325",
+    "id": "ff68f8c5.ac398",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5628.499755859375,
-    "y": 6754,
-    "z": "4138d8f7.da252",
+    "x": 5711.566421508789,
+    "y": 6836.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2907eab4.583386"
+        "3023756a.3df6f2"
       ]
     ]
   },
   {
-    "id": "2907eab4.583386",
+    "id": "3023756a.3df6f2",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5837.499755859375,
-    "y": 6752,
-    "z": "4138d8f7.da252",
+    "x": 5920.566421508789,
+    "y": 6834.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9bb50a9.812c6f8",
+    "id": "4c65c6ba.14ece",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4738.499755859375,
-    "y": 6740,
-    "z": "4138d8f7.da252",
+    "x": 4821.566421508789,
+    "y": 6822.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3d6f4e35.1dbdf2"
+        "bbd937d0.174fa8"
       ]
     ]
   },
   {
-    "id": "9655804c.a8367",
+    "id": "4f0e8fb5.8e798",
     "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": 4746.499755859375,
-    "y": 6633,
-    "z": "4138d8f7.da252",
+    "x": 4829.566421508789,
+    "y": 6715.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e3853ecb.86ffa8",
-        "e9c51b36.8628d",
-        "65b57cea.285c3c"
+        "689e25a7.4ec344",
+        "fb96069a.99a898",
+        "67a95680.dd059"
       ]
     ]
   },
   {
-    "id": "e3853ecb.86ffa8",
+    "id": "689e25a7.4ec344",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4982.499755859375,
-    "y": 6616,
-    "z": "4138d8f7.da252",
+    "x": 5065.566421508789,
+    "y": 6698.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "e9c51b36.8628d",
+    "id": "fb96069a.99a898",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4979.499755859375,
-    "y": 6657,
-    "z": "4138d8f7.da252",
+    "x": 5062.566421508789,
+    "y": 6739.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "65b57cea.285c3c",
+    "id": "67a95680.dd059",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4993.499755859375,
-    "y": 6697,
-    "z": "4138d8f7.da252",
+    "x": 5076.566421508789,
+    "y": 6779.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "94748373.e9e958",
+    "id": "e1e51f2c.3838b",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4682.499755859375,
-    "y": 6792,
-    "z": "4138d8f7.da252",
+    "x": 4765.566421508789,
+    "y": 6874.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a0da2cb6.f8de08",
+    "id": "38f3723d.fc373e",
     "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": 4690.499755859375,
-    "y": 6850,
-    "z": "4138d8f7.da252",
+    "x": 4773.566421508789,
+    "y": 6932.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ca3ef968.6dda08",
+    "id": "cfbbd347.67bf98",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4695.499755859375,
-    "y": 6590,
-    "z": "4138d8f7.da252",
+    "x": 4778.566421508789,
+    "y": 6672.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "85cec0fe.92a4b",
+    "id": "b798d2b8.423e4",
     "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": 4810.499755859375,
-    "y": 6542,
-    "z": "4138d8f7.da252",
+    "x": 4893.566421508789,
+    "y": 6624.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "edcf20b8.e61748",
+    "id": "c29275cf.22abd8",
     "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": 4803.499969482422,
-    "y": 7257.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4886.566635131836,
+    "y": 7340.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e8e7019e.0ce4e8",
-        "cf2cb292.2ab218"
+        "48d3293f.1d09c8",
+        "2e7c42e6.c2eade"
       ]
     ]
   },
   {
-    "id": "e8e7019e.0ce4e8",
+    "id": "48d3293f.1d09c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5059.499969482422,
-    "y": 7229.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5142.566635131836,
+    "y": 7312.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2fafeba7.6be734"
+        "fc947668.8a9d8"
       ]
     ]
   },
   {
-    "id": "cf2cb292.2ab218",
+    "id": "2e7c42e6.c2eade",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5059.499969482422,
-    "y": 7278.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5142.566635131836,
+    "y": 7361.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "997dfd42.35e9c",
+    "id": "86241828.71762",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5325.499969482422,
-    "y": 7270.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5408.566635131836,
+    "y": 7353.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fd323ea3.0ba61",
-        "4fecf72f.04fbc",
-        "8645a39d.96b86"
+        "78fc3e29.1eba58",
+        "424309da.5dae7",
+        "7b230c0f.716d14"
       ]
     ]
   },
   {
-    "id": "81edaff5.fe8de8",
+    "id": "ec22280e.4e15f",
     "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": 5717.499755859375,
-    "y": 7349,
-    "z": "4138d8f7.da252",
+    "x": 5800.566421508789,
+    "y": 7431.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8645a39d.96b86",
+    "id": "7b230c0f.716d14",
     "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": 5687.499755859375,
-    "y": 7409,
-    "z": "4138d8f7.da252",
+    "x": 5770.566421508789,
+    "y": 7491.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "fd323ea3.0ba61",
+    "id": "78fc3e29.1eba58",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5594.499755859375,
-    "y": 7237,
-    "z": "4138d8f7.da252",
+    "x": 5677.566421508789,
+    "y": 7319.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a2f25d49.46cd88",
+    "id": "e6235853.96452",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3944.5,
-    "y": 5875,
-    "z": "4138d8f7.da252",
+    "x": 4027.566665649414,
+    "y": 5957.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4e6fe55.c2f201c",
-        "7170f2f2.71fadc",
-        "2402858c.2e7c4a",
-        "2fcf2035.98d3c",
-        "ff11fb03.980398"
+        "3c45c16a.44e536",
+        "131a46fd.415b69",
+        "bd42462a.156a88",
+        "28f03df7.2bcada",
+        "99843e38.83dd4"
       ]
     ]
   },
   {
-    "id": "d7183096.a014a",
+    "id": "825ad15b.e200f",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4687.499755859375,
-    "y": 6690,
-    "z": "4138d8f7.da252",
+    "x": 4770.566421508789,
+    "y": 6772.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "5a3abbf9.5bd584",
+    "id": "72bff017.143e6",
     "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": 4810.5,
-    "y": 6420,
-    "z": "4138d8f7.da252",
+    "x": 4893.566665649414,
+    "y": 6502.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "48e1585a.35691",
+    "id": "218269db.41502e",
     "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": 4947.5,
-    "y": 6370,
-    "z": "4138d8f7.da252",
+    "x": 5030.566665649414,
+    "y": 6452.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "829d6c73.aa7da8",
+    "id": "e1cb1e55.b0357",
     "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": 6409.5,
-    "y": 1904,
-    "z": "4138d8f7.da252",
+    "x": 6492.566665649414,
+    "y": 1986.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "261b01ae.fe9b36",
+    "id": "d01f4492.e07e28",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3675.5,
-    "y": 1298,
-    "z": "4138d8f7.da252",
+    "x": 3758.566665649414,
+    "y": 1380.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f92c744c.f5b4a8",
+    "id": "27d91ce4.eff5e4",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3813.5,
-    "y": 1786,
-    "z": "4138d8f7.da252",
+    "x": 3896.566665649414,
+    "y": 1868.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a9675d4a.27492",
+    "id": "bcdaf6d5.61613",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6370.5,
-    "y": 2616,
-    "z": "4138d8f7.da252",
+    "x": 6453.566665649414,
+    "y": 2698.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "577ac65e.4cd8e8",
+    "id": "1992e083.76e587",
     "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": 3662.5,
-    "y": 4892,
-    "z": "4138d8f7.da252",
+    "x": 3745.566665649414,
+    "y": 4974.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c33c721b.c24a68",
+    "id": "aaed5b46.7e8eb",
     "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": 3795.5,
-    "y": 4940,
-    "z": "4138d8f7.da252",
+    "x": 3878.566665649414,
+    "y": 5022.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "3da01b2d.c332ec",
+    "id": "d0f2c5e0.41cd1",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4340.499755859375,
-    "y": 5020,
-    "z": "4138d8f7.da252",
+    "x": 4423.566421508789,
+    "y": 5102.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "67f3fde2.d1c4bc",
-        "830cc023.8d75b8"
+        "c51b9855.45ff88",
+        "4079da5.fe1c9a4"
       ]
     ]
   },
   {
-    "id": "67f3fde2.d1c4bc",
+    "id": "c51b9855.45ff88",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4533.499755859375,
-    "y": 5021,
-    "z": "4138d8f7.da252",
+    "x": 4616.566421508789,
+    "y": 5103.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "97ecf17d.e53ae8"
+        "69766fb9.fbb74"
       ]
     ]
   },
   {
-    "id": "830cc023.8d75b8",
+    "id": "4079da5.fe1c9a4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.499755859375,
-    "y": 5065,
-    "z": "4138d8f7.da252",
+    "x": 4620.566421508789,
+    "y": 5147.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e6486dc.92da59"
+        "1a522b67.5bcd1d"
       ]
     ]
   },
   {
-    "id": "e6486dc.92da59",
+    "id": "1a522b67.5bcd1d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4676.499755859375,
-    "y": 5060,
-    "z": "4138d8f7.da252",
+    "x": 4759.566421508789,
+    "y": 5142.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f9d2f7c1.e8a63",
-        "2f9c4db0.869cca",
-        "cfcbce5e.a3353"
+        "e1cf34bb.9518e",
+        "6d11acf9.928044",
+        "613e9b77.298d54"
       ]
     ]
   },
   {
-    "id": "97ecf17d.e53ae8",
+    "id": "69766fb9.fbb74",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4676.499755859375,
-    "y": 5017,
-    "z": "4138d8f7.da252",
+    "x": 4759.566421508789,
+    "y": 5099.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fd2b62b6.10b14",
-        "f21eb35f.395438",
-        "59f69d26.ab3de4",
-        "8af1d85e.882ed"
+        "6ac119cc.845568",
+        "be6577a4.990a1",
+        "ed1c0a9d.7a148",
+        "684d6198.d250c8"
       ]
     ]
   },
   {
-    "id": "f9d2f7c1.e8a63",
+    "id": "e1cf34bb.9518e",
     "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": 5070.499755859375,
-    "y": 5311,
-    "z": "4138d8f7.da252",
+    "x": 5153.566421508789,
+    "y": 5393.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a14dbd8f.fd09c8",
+    "id": "63360813.209ad8",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5077.499755859375,
-    "y": 5265,
-    "z": "4138d8f7.da252",
+    "x": 5160.566421508789,
+    "y": 5347.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "860af8d0.fc96e8",
+    "id": "debab96e.421598",
     "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": 4867.499969482422,
-    "y": 6979.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4950.566635131836,
+    "y": 7062.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f9c4db0.869cca",
+    "id": "6d11acf9.928044",
     "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": 5189.499755859375,
-    "y": 5364,
-    "z": "4138d8f7.da252",
+    "x": 5272.566421508789,
+    "y": 5446.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1f30d01.395cc3",
+    "id": "d4dec9b1.cf9de8",
     "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": 5071.499755859375,
-    "y": 5582,
-    "z": "4138d8f7.da252",
+    "x": 5154.566421508789,
+    "y": 5664.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7b3410e.fff05",
+    "id": "dbce4650.6b5848",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3617.5,
-    "y": 4341,
-    "z": "4138d8f7.da252",
+    "x": 3700.566665649414,
+    "y": 4423.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7607e020.fe77f",
+    "id": "edcfccb6.0b10e8",
     "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": 3951.5,
-    "y": 4524,
-    "z": "4138d8f7.da252",
+    "x": 4034.566665649414,
+    "y": 4606.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "e8ff43f0.c9213",
+    "id": "c7aee100.ec3998",
     "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": 3563.5,
-    "y": 4391,
-    "z": "4138d8f7.da252",
+    "x": 3646.566665649414,
+    "y": 4473.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3f20a2e3.9197ce",
-        "836b51a4.29ff7",
-        "a19206dd.24a2b8"
+        "1339ee7e.d32932",
+        "f08ce63a.aff18",
+        "a999ee96.e09558"
       ]
     ]
   },
   {
-    "id": "836b51a4.29ff7",
+    "id": "f08ce63a.aff18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3790.990966796875,
-    "y": 4363.573974609375,
-    "z": "4138d8f7.da252",
+    "x": 3874.057632446289,
+    "y": 4445.859725952148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cc477903.35a1a8"
+        "1c6fd05d.948d88"
       ]
     ]
   },
   {
-    "id": "a19206dd.24a2b8",
+    "id": "a999ee96.e09558",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3786.5,
-    "y": 4407.999938964844,
-    "z": "4138d8f7.da252",
+    "x": 3869.566665649414,
+    "y": 4490.285690307617,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9ac9aba4.1e8ac"
+        "1f86883b.9ad4a8"
       ]
     ]
   },
   {
-    "id": "cc477903.35a1a8",
+    "id": "1c6fd05d.948d88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3953.5625,
-    "y": 4362.859680175781,
-    "z": "4138d8f7.da252",
+    "x": 4036.629165649414,
+    "y": 4445.145431518555,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9ac9aba4.1e8ac",
+    "id": "1f86883b.9ad4a8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3954.5,
-    "y": 4407.999938964844,
-    "z": "4138d8f7.da252",
+    "x": 4037.566665649414,
+    "y": 4490.285690307617,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "44a45bc4.fd8d24",
+    "id": "1213361d.be12aa",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3739.5,
-    "y": 4481,
-    "z": "4138d8f7.da252",
+    "x": 3822.566665649414,
+    "y": 4563.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8f06a9d6.e85d2",
-        "7607e020.fe77f"
+        "fbd53f4.dd8234",
+        "edcfccb6.0b10e8"
       ]
     ]
   },
   {
-    "id": "3f20a2e3.9197ce",
+    "id": "1339ee7e.d32932",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3570.5,
-    "y": 4481,
-    "z": "4138d8f7.da252",
+    "x": 3653.566665649414,
+    "y": 4563.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "44a45bc4.fd8d24"
+        "1213361d.be12aa"
       ]
     ]
   },
   {
-    "id": "8f06a9d6.e85d2",
+    "id": "fbd53f4.dd8234",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3928.5,
-    "y": 4473,
-    "z": "4138d8f7.da252",
+    "x": 4011.566665649414,
+    "y": 4555.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c23415ae.23176",
+    "id": "b969bbc7.e53528",
     "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": 3770.5,
-    "y": 4768,
-    "z": "4138d8f7.da252",
+    "x": 3853.566665649414,
+    "y": 4850.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "cb253b17.73576",
+    "id": "a6ad0dd0.a6fcc8",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3553.5,
-    "y": 2851,
-    "z": "4138d8f7.da252",
+    "x": 3636.566665649414,
+    "y": 2933.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9d7a29e5.a75ec",
+    "id": "d73dbef9.62ae5",
     "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": 2758.5,
-    "y": 4413,
-    "z": "4138d8f7.da252",
+    "x": 2841.566665649414,
+    "y": 4495.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8b862d24.0bbe68",
+    "id": "38b3d969.be8c96",
     "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": 3181.5,
-    "y": 4686,
-    "z": "4138d8f7.da252",
+    "x": 3264.566665649414,
+    "y": 4768.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b605d8db.884f2",
-        "fdd54f31.8fbee"
+        "4afa5be1.7f901c",
+        "3036b28a.042a4e"
       ]
     ]
   },
   {
-    "id": "db2110db.2b1778",
+    "id": "d77e7161.5348c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3013.5,
-    "y": 4689,
-    "z": "4138d8f7.da252",
+    "x": 3096.566665649414,
+    "y": 4771.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8b862d24.0bbe68"
+        "38b3d969.be8c96"
       ]
     ]
   },
   {
-    "id": "fdd54f31.8fbee",
+    "id": "3036b28a.042a4e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3344.5,
-    "y": 4705,
-    "z": "4138d8f7.da252",
+    "x": 3427.566665649414,
+    "y": 4787.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9f11b3.a8080e5"
+        "300daee4.3b0352"
       ]
     ]
   },
   {
-    "id": "b605d8db.884f2",
+    "id": "4afa5be1.7f901c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3380.5,
-    "y": 3312,
-    "z": "4138d8f7.da252",
+    "x": 3463.566665649414,
+    "y": 3394.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "947600ba.b5e73"
+        "afe0131e.843c9"
       ]
     ]
   },
   {
-    "id": "4f6ce4fa.367e24",
+    "id": "40724b83.4d51bc",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3729.5,
-    "y": 3154,
-    "z": "4138d8f7.da252",
+    "x": 3812.566665649414,
+    "y": 3236.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cc96bd45.2e2b6",
-        "f9a0faf9.5c3dc8"
+        "822b2d43.9a91a",
+        "33ca94.ea4af56c"
       ]
     ]
   },
   {
-    "id": "cc96bd45.2e2b6",
+    "id": "822b2d43.9a91a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3934.5,
-    "y": 3150,
-    "z": "4138d8f7.da252",
+    "x": 4017.566665649414,
+    "y": 3232.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f9a0faf9.5c3dc8",
+    "id": "33ca94.ea4af56c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3936.5,
-    "y": 3200,
-    "z": "4138d8f7.da252",
+    "x": 4019.566665649414,
+    "y": 3282.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7a40f51a.96d7fc"
+        "1d0af02e.93b4f"
       ]
     ]
   },
   {
-    "id": "7a40f51a.96d7fc",
+    "id": "1d0af02e.93b4f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4092.5,
-    "y": 3206,
-    "z": "4138d8f7.da252",
+    "x": 4175.566665649414,
+    "y": 3288.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2c2d832.1ec14fc",
-        "16e3f1c0.bf6bbe",
-        "3515662b.208b2a",
-        "271e520.e6acbae"
+        "523d0093.735cb",
+        "21f4d27b.d11a96",
+        "1c5f100e.a5d978",
+        "2d4de683.3992d2"
       ]
     ]
   },
   {
-    "id": "2c2d832.1ec14fc",
+    "id": "523d0093.735cb",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4318.500244140625,
-    "y": 2947,
-    "z": "4138d8f7.da252",
+    "x": 4401.566909790039,
+    "y": 3029.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f6d89aab.47f778",
+    "id": "fce8efa1.5f12e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4817.499725341797,
-    "y": 4243.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4900.566390991211,
+    "y": 4326.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f49c2dcf.bc27d8",
-        "cc8917f6.431d58"
+        "e3611e5a.49f6f",
+        "7474f571.02042c"
       ]
     ]
   },
   {
-    "id": "cc8917f6.431d58",
+    "id": "7474f571.02042c",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5019.499481201172,
-    "y": 4210.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5102.566146850586,
+    "y": 4293.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a80257aa.4070f",
+    "id": "c554c9c8.b91c38",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4703.499969482422,
-    "y": 4420.999725341797,
-    "z": "4138d8f7.da252",
+    "x": 4786.566635131836,
+    "y": 4503.28547668457,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d0212ac6.85c08",
+    "id": "9c21225.8549a6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4700.562103271484,
-    "y": 4369.8597412109375,
-    "z": "4138d8f7.da252",
+    "x": 4783.628768920898,
+    "y": 4452.145492553711,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "efad35a4.dd1e7",
+    "id": "6669e686.3a92d",
     "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": 4283.499725341797,
-    "y": 4243.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4366.566390991211,
+    "y": 4326.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "bbd4adaa.78aa88"
+        "6cdd29ff.2176f"
       ]
     ]
   },
   {
-    "id": "bbd4adaa.78aa88",
+    "id": "6cdd29ff.2176f",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4488.499725341797,
-    "y": 4243.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4571.566390991211,
+    "y": 4326.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7d1062e5.6c959c"
+        "462e489b.1c9ea8"
       ]
     ]
   },
   {
-    "id": "7d1062e5.6c959c",
+    "id": "462e489b.1c9ea8",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4654.499725341797,
-    "y": 4243.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4737.566390991211,
+    "y": 4326.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f6d89aab.47f778"
+        "fce8efa1.5f12e"
       ]
     ]
   },
   {
-    "id": "f49c2dcf.bc27d8",
+    "id": "e3611e5a.49f6f",
     "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": 4326.499725341797,
-    "y": 4321.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4409.566390991211,
+    "y": 4404.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2b073b5b.643194",
-        "ffd59a4c.14fa7",
-        "2abdbd7a.263a72"
+        "5af860a5.71ed3",
+        "234eb12a.7530fe",
+        "358a6c9c.71984c"
       ]
     ]
   },
   {
-    "id": "2b073b5b.643194",
+    "id": "5af860a5.71ed3",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.499725341797,
-    "y": 4323.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4620.566390991211,
+    "y": 4406.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b25769d8.6df3c8"
+        "e32197a7.4c81d8"
       ]
     ]
   },
   {
-    "id": "ffd59a4c.14fa7",
+    "id": "234eb12a.7530fe",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.990692138672,
-    "y": 4369.574005126953,
-    "z": "4138d8f7.da252",
+    "x": 4621.057357788086,
+    "y": 4451.859756469727,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d0212ac6.85c08"
+        "9c21225.8549a6"
       ]
     ]
   },
   {
-    "id": "2abdbd7a.263a72",
+    "id": "358a6c9c.71984c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4535.499725341797,
-    "y": 4412.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4618.566390991211,
+    "y": 4495.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a80257aa.4070f"
+        "c554c9c8.b91c38"
       ]
     ]
   },
   {
-    "id": "947600ba.b5e73",
+    "id": "afe0131e.843c9",
     "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": 3603.5,
-    "y": 2997,
-    "z": "4138d8f7.da252",
+    "x": 3686.566665649414,
+    "y": 3079.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6a786745.af48",
-        "a633d7c2.0708",
-        "f368276f.48f958"
+        "9dbeb0e5.86c59",
+        "ca19c457.91ce7",
+        "a8db99d3.ea1d58"
       ]
     ]
   },
   {
-    "id": "a633d7c2.0708",
+    "id": "ca19c457.91ce7",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3830.990966796875,
-    "y": 2969.573974609375,
-    "z": "4138d8f7.da252",
+    "x": 3914.057632446289,
+    "y": 3051.8597259521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "30a6f1cd.e89f6e"
+        "940a0baf.b50538"
       ]
     ]
   },
   {
-    "id": "f368276f.48f958",
+    "id": "a8db99d3.ea1d58",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3826.5,
-    "y": 3013.9999389648438,
-    "z": "4138d8f7.da252",
+    "x": 3909.566665649414,
+    "y": 3096.285690307617,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "868e3def.777d88"
+        "199d9fc8.23d478"
       ]
     ]
   },
   {
-    "id": "30a6f1cd.e89f6e",
+    "id": "940a0baf.b50538",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3993.5625,
-    "y": 2968.8596801757812,
-    "z": "4138d8f7.da252",
+    "x": 4076.629165649414,
+    "y": 3051.1454315185547,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "868e3def.777d88",
+    "id": "199d9fc8.23d478",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3994.5,
-    "y": 3013.9999389648438,
-    "z": "4138d8f7.da252",
+    "x": 4077.566665649414,
+    "y": 3096.285690307617,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6a786745.af48",
+    "id": "9dbeb0e5.86c59",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3838.5,
-    "y": 3064,
-    "z": "4138d8f7.da252",
+    "x": 3921.566665649414,
+    "y": 3146.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4f6ce4fa.367e24"
+        "40724b83.4d51bc"
       ]
     ]
   },
   {
-    "id": "e1ab631b.742fc",
+    "id": "667c445f.dc3e5c",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3728.383331298828,
-    "y": 3254.883331298828,
-    "z": "4138d8f7.da252",
+    "x": 3811.449996948242,
+    "y": 3337.1690826416016,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9ac35f29.2f46a8",
+    "id": "7651a38e.4e7e44",
     "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": 3710.10009765625,
-    "y": 3816.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 3793.166763305664,
+    "y": 3898.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3dda5d6b.eae642",
+    "id": "e0666b60.cb174",
     "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": 3848.10009765625,
-    "y": 3874.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 3931.166763305664,
+    "y": 3956.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "16e3f1c0.bf6bbe",
+    "id": "21f4d27b.d11a96",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3426.10009765625,
-    "y": 3556.083251953125,
-    "z": "4138d8f7.da252",
+    "x": 3509.166763305664,
+    "y": 3638.3690032958984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "616a588c.b788e8",
-        "23b69bc.0871b64",
-        "92806e4e.351398"
+        "407839fb.167e2",
+        "931a7a68.51c848",
+        "f4ea682a.e63f08"
       ]
     ]
   },
   {
-    "id": "14abd55c.d773d3",
+    "id": "91a690e7.1a5918",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3667.10009765625,
-    "y": 3984.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 3750.166763305664,
+    "y": 4066.7691497802734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5c65738b.87fde4",
-        "f1d641f8.d259a8"
+        "34fa09a4.b2b1ae",
+        "809131d.392dfd"
       ]
     ]
   },
   {
-    "id": "5c65738b.87fde4",
+    "id": "34fa09a4.b2b1ae",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3860.10009765625,
-    "y": 3985.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 3943.166763305664,
+    "y": 4067.7691497802734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "65a9280d.a9da1"
+        "b77388f8.551df8"
       ]
     ]
   },
   {
-    "id": "f1d641f8.d259a8",
+    "id": "809131d.392dfd",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3864.10009765625,
-    "y": 4029.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 3947.166763305664,
+    "y": 4111.769149780273,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5b392e39.74c58"
+        "2e72f134.3b345e"
       ]
     ]
   },
   {
-    "id": "5b392e39.74c58",
+    "id": "2e72f134.3b345e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4003.10009765625,
-    "y": 4024.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 4086.166763305664,
+    "y": 4106.769149780273,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "efad35a4.dd1e7"
+        "6669e686.3a92d"
       ]
     ]
   },
   {
-    "id": "65a9280d.a9da1",
+    "id": "b77388f8.551df8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4004.10009765625,
-    "y": 3981.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 4087.166763305664,
+    "y": 4063.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3515662b.208b2a",
+    "id": "1c5f100e.a5d978",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4352.217041015625,
-    "y": 3203.283447265625,
-    "z": "4138d8f7.da252",
+    "x": 4435.283706665039,
+    "y": 3285.5691986083984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d3894fc3.10eb48",
-        "b517f9eb.6c257"
+        "f17d25a9.fc3a28",
+        "d1a832ec.f421b"
       ]
     ]
   },
   {
-    "id": "d3894fc3.10eb48",
+    "id": "f17d25a9.fc3a28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4551.384033203125,
-    "y": 3269.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 4634.450698852539,
+    "y": 3352.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d481f8d7.46db"
+        "3ef002bf.b5c35e"
       ]
     ]
   },
   {
-    "id": "b517f9eb.6c257",
+    "id": "d1a832ec.f421b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573.384033203125,
-    "y": 3114.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 4656.450698852539,
+    "y": 3197.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "543771c5.3e82b"
+        "d05f5529.96a4b8"
       ]
     ]
   },
   {
-    "id": "271e520.e6acbae",
+    "id": "2d4de683.3992d2",
     "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": 4351.217041015625,
-    "y": 3058.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 4434.283706665039,
+    "y": 3140.7691497802734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5841cd16.599de4",
+    "id": "e42871e4.7e7078",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4367.384033203125,
-    "y": 3011.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 4450.450698852539,
+    "y": 3094.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c6724a1e.a746a",
+    "id": "dcbc2987.d3bdd",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4922.14990234375,
-    "y": 2466.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5005.216567993164,
+    "y": 2549.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f5319096.b377c8",
+    "id": "feb1ef44.b73648",
     "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": 5524.14990234375,
-    "y": 2571.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5607.216567993164,
+    "y": 2654.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1d10f282.65ef3d",
+    "id": "56698383.1dde24",
     "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": 4914.149658203125,
-    "y": 2512.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 4997.216323852539,
+    "y": 2595.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e6ffa5af.877ac",
-        "53ba0501.50937c",
-        "f8ebf6c0.ef2f7"
+        "b538dd4e.00fce",
+        "3917ea5e.68d896",
+        "234d36ee.00b9a2"
       ]
     ]
   },
   {
-    "id": "53ba0501.50937c",
+    "id": "3917ea5e.68d896",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5141.640625,
-    "y": 2485.457275390625,
-    "z": "4138d8f7.da252",
+    "x": 5224.707290649414,
+    "y": 2567.7430267333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "25bf7485.4207ec"
+        "bb66fc72.62525"
       ]
     ]
   },
   {
-    "id": "f8ebf6c0.ef2f7",
+    "id": "234d36ee.00b9a2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5137.149658203125,
-    "y": 2529.8832397460938,
-    "z": "4138d8f7.da252",
+    "x": 5220.216323852539,
+    "y": 2612.168991088867,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8cc56294.07b6a"
+        "2eceea5f.8355a6"
       ]
     ]
   },
   {
-    "id": "25bf7485.4207ec",
+    "id": "bb66fc72.62525",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5304.212158203125,
-    "y": 2484.7429809570312,
-    "z": "4138d8f7.da252",
+    "x": 5387.278823852539,
+    "y": 2567.0287322998047,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8cc56294.07b6a",
+    "id": "2eceea5f.8355a6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5305.149658203125,
-    "y": 2529.8832397460938,
-    "z": "4138d8f7.da252",
+    "x": 5388.216323852539,
+    "y": 2612.168991088867,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "29839d19.ca2152",
+    "id": "b5d59b15.1b765",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5302.149658203125,
-    "y": 2579.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5385.216323852539,
+    "y": 2662.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4a49d064.4801a8",
-        "f5319096.b377c8"
+        "85d5ae48.70e33",
+        "feb1ef44.b73648"
       ]
     ]
   },
   {
-    "id": "e6ffa5af.877ac",
+    "id": "b538dd4e.00fce",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5133.149658203125,
-    "y": 2579.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5216.216323852539,
+    "y": 2662.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "29839d19.ca2152"
+        "b5d59b15.1b765"
       ]
     ]
   },
   {
-    "id": "4a49d064.4801a8",
+    "id": "85d5ae48.70e33",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5484.150390625,
-    "y": 2521.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5567.217056274414,
+    "y": 2604.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "fc1d58de.266bc8",
+    "id": "3c4fd972.8c727e",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4565.383331298828,
-    "y": 3076.883331298828,
-    "z": "4138d8f7.da252",
+    "x": 4648.449996948242,
+    "y": 3159.1690826416016,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "81aa1dbe.56ac78",
+    "id": "9a2b9c1d.56f0c",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4564.217041015625,
-    "y": 3233.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 4647.283706665039,
+    "y": 3315.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "175559ed.ae176e",
+    "id": "22475743.9e3838",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5013.21630859375,
-    "y": 2806.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5096.282974243164,
+    "y": 2888.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b4d05ea3.ef437",
+    "id": "791cfc48.d2aabc",
     "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": 5615.21630859375,
-    "y": 2911.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5698.282974243164,
+    "y": 2993.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "909ddf1c.4247f",
+    "id": "b94b085c.7cb5a8",
     "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": 5005.216064453125,
-    "y": 2852.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5088.282730102539,
+    "y": 2934.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6ec56bfe.bf9374",
-        "ac80268f.768e5",
-        "a8e739ac.bd4b"
+        "d976d76c.67e958",
+        "8e60ee6f.c2d2f",
+        "835f78f2.c41258"
       ]
     ]
   },
   {
-    "id": "ac80268f.768e5",
+    "id": "8e60ee6f.c2d2f",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5232.70703125,
-    "y": 2825.25732421875,
-    "z": "4138d8f7.da252",
+    "x": 5315.773696899414,
+    "y": 2907.5430755615234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c8c7d986.838778"
+        "bf2ec467.02c0d8"
       ]
     ]
   },
   {
-    "id": "a8e739ac.bd4b",
+    "id": "835f78f2.c41258",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5228.216064453125,
-    "y": 2869.6832885742188,
-    "z": "4138d8f7.da252",
+    "x": 5311.282730102539,
+    "y": 2951.969039916992,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3dcb1fdf.a3fec"
+        "c322ac12.a985c8"
       ]
     ]
   },
   {
-    "id": "c8c7d986.838778",
+    "id": "bf2ec467.02c0d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5395.278564453125,
-    "y": 2824.5430297851562,
-    "z": "4138d8f7.da252",
+    "x": 5478.345230102539,
+    "y": 2906.8287811279297,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3dcb1fdf.a3fec",
+    "id": "c322ac12.a985c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5396.216064453125,
-    "y": 2869.6832885742188,
-    "z": "4138d8f7.da252",
+    "x": 5479.282730102539,
+    "y": 2951.969039916992,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9b0bdc3d.6e83d8",
+    "id": "380b5701.029218",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5393.216064453125,
-    "y": 2919.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5476.282730102539,
+    "y": 3001.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e12fb18d.e25528",
-        "b4d05ea3.ef437"
+        "2037a317.5823d4",
+        "791cfc48.d2aabc"
       ]
     ]
   },
   {
-    "id": "6ec56bfe.bf9374",
+    "id": "d976d76c.67e958",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5224.216064453125,
-    "y": 2919.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5307.282730102539,
+    "y": 3001.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9b0bdc3d.6e83d8"
+        "380b5701.029218"
       ]
     ]
   },
   {
-    "id": "e12fb18d.e25528",
+    "id": "2037a317.5823d4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5575.216796875,
-    "y": 2861.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5658.283462524414,
+    "y": 2943.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "77cc19f0.65a298",
+    "id": "d383ac36.342cc",
     "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": 4930.216064453125,
-    "y": 2765.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5013.282730102539,
+    "y": 2847.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d481f8d7.46db",
+    "id": "3ef002bf.b5c35e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4723.383331298828,
-    "y": 3258.883331298828,
-    "z": "4138d8f7.da252",
+    "x": 4806.449996948242,
+    "y": 3341.1690826416016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "77cc19f0.65a298",
-        "909ddf1c.4247f",
-        "d39256ff.c99e4"
+        "d383ac36.342cc",
+        "b94b085c.7cb5a8",
+        "37f3e792.01b98"
       ]
     ]
   },
   {
-    "id": "543771c5.3e82b",
+    "id": "d05f5529.96a4b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4744.11669921875,
-    "y": 3085.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 4827.183364868164,
+    "y": 3167.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9e50adf.3f804d",
-        "1d10f282.65ef3d",
-        "3c12d321.f6ab2c"
+        "30b48cfc.8858f4",
+        "56698383.1dde24",
+        "9f73e0e4.5bd9a8"
       ]
     ]
   },
   {
-    "id": "9e50adf.3f804d",
+    "id": "30b48cfc.8858f4",
     "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": 4878.949462890625,
-    "y": 2391.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 4962.016128540039,
+    "y": 2473.7691497802734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d7fa5270.13e728",
+    "id": "eb34d49c.d22a8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4338.2666015625,
-    "y": 3158.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 4421.333267211914,
+    "y": 3240.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "fea06caf.d7087",
+    "id": "2675acce.b9a12c",
     "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": 3807.600067138672,
-    "y": 4147.483856201172,
-    "z": "4138d8f7.da252",
+    "x": 3890.666732788086,
+    "y": 4229.769607543945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5c1ea12c.02fb18",
+    "id": "b63f121.ce4247",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3642.600067138672,
-    "y": 4219.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 3725.666732788086,
+    "y": 4301.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b82e9023.76f9f8",
-        "f2f0e3e2.cfb0a8"
+        "8b9ac42e.1e08f",
+        "109545ec.57786a"
       ]
     ]
   },
   {
-    "id": "b82e9023.76f9f8",
+    "id": "8b9ac42e.1e08f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3853.600067138672,
-    "y": 4219.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 3936.666732788086,
+    "y": 4301.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4d4a5650.900498"
+        "8bee6e1e.eff33"
       ]
     ]
   },
   {
-    "id": "f2f0e3e2.cfb0a8",
+    "id": "109545ec.57786a",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3849.600067138672,
-    "y": 4267.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 3932.666732788086,
+    "y": 4349.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "87662134.188498"
+        "a4995391.fc5358"
       ]
     ]
   },
   {
-    "id": "4d4a5650.900498",
+    "id": "8bee6e1e.eff33",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4009.600067138672,
-    "y": 4215.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 4092.666732788086,
+    "y": 4297.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cdbc2fd5.f72b4"
+        "b36b53d7.2d66a8"
       ]
     ]
   },
   {
-    "id": "87662134.188498",
+    "id": "a4995391.fc5358",
     "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": 3997.600067138672,
-    "y": 4262.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 4080.666732788086,
+    "y": 4344.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2111dda1.fcbdb2",
+    "id": "294f0835.1325e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4850.566162109375,
-    "y": 4529.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4933.632827758789,
+    "y": 4612.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4fae975f.53fc68",
-        "c1f934d5.cc0aa8"
+        "66149bc9.393fc4",
+        "ca1fbeb5.c9d45"
       ]
     ]
   },
   {
-    "id": "c1f934d5.cc0aa8",
+    "id": "ca1fbeb5.c9d45",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5093.56640625,
-    "y": 4498.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 5176.633071899414,
+    "y": 4581.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cf80b7cc.7e2e9",
+    "id": "fb61c0ac.1edc98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4710.566162109375,
-    "y": 4639.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4793.632827758789,
+    "y": 4722.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "94dec63b.8ae1e"
+        "3b9c82f6.e6f406"
       ]
     ]
   },
   {
-    "id": "840bbd02.3035a",
+    "id": "ca5b121a.c4f29",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4698.56640625,
-    "y": 4732.8828125,
-    "z": "4138d8f7.da252",
+    "x": 4781.633071899414,
+    "y": 4815.168563842773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cdbcda75.ac4888",
+    "id": "27d3cdcb.a5be82",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4700.6285400390625,
-    "y": 4687.742340087891,
-    "z": "4138d8f7.da252",
+    "x": 4783.695205688477,
+    "y": 4770.028091430664,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cdbc2fd5.f72b4",
+    "id": "b36b53d7.2d66a8",
     "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": 4316.566162109375,
-    "y": 4529.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4399.632827758789,
+    "y": 4612.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "bc868ed9.895db8"
+        "a0726a73.552d38"
       ]
     ]
   },
   {
-    "id": "bc868ed9.895db8",
+    "id": "a0726a73.552d38",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4521.566162109375,
-    "y": 4529.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4604.632827758789,
+    "y": 4612.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7ae6a8de.c87848"
+        "c054f471.25372"
       ]
     ]
   },
   {
-    "id": "7ae6a8de.c87848",
+    "id": "c054f471.25372",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4687.566162109375,
-    "y": 4529.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4770.632827758789,
+    "y": 4612.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2111dda1.fcbdb2"
+        "294f0835.1325e"
       ]
     ]
   },
   {
-    "id": "4fae975f.53fc68",
+    "id": "66149bc9.393fc4",
     "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": 4326.566162109375,
-    "y": 4639.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4409.632827758789,
+    "y": 4722.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c295dc4d.214d28",
-        "c45fd018.eeb138",
-        "e9db7616.b3ebb8"
+        "6e23d592.fd6b7c",
+        "ebdcd4d0.c0565",
+        "cbc774c8.750668"
       ]
     ]
   },
   {
-    "id": "c295dc4d.214d28",
+    "id": "6e23d592.fd6b7c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.566162109375,
-    "y": 4641.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4620.632827758789,
+    "y": 4724.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cf80b7cc.7e2e9"
+        "fb61c0ac.1edc98"
       ]
     ]
   },
   {
-    "id": "c45fd018.eeb138",
+    "id": "ebdcd4d0.c0565",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4538.05712890625,
-    "y": 4687.456604003906,
-    "z": "4138d8f7.da252",
+    "x": 4621.123794555664,
+    "y": 4769.74235534668,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cdbcda75.ac4888"
+        "27d3cdcb.a5be82"
       ]
     ]
   },
   {
-    "id": "e9db7616.b3ebb8",
+    "id": "cbc774c8.750668",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4535.566162109375,
-    "y": 4730.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4618.632827758789,
+    "y": 4813.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "840bbd02.3035a"
+        "ca5b121a.c4f29"
       ]
     ]
   },
   {
-    "id": "297b4ae7.8b9706",
+    "id": "c9811fe.3333a6",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5946.383056640625,
-    "y": 7029.08349609375,
-    "z": "4138d8f7.da252",
+    "x": 6029.449722290039,
+    "y": 7111.369247436523,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "457d3858.29d0e",
+    "id": "e4958a72.db4418",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5214.850067138672,
-    "y": 4260.283172607422,
-    "z": "4138d8f7.da252",
+    "x": 5297.916732788086,
+    "y": 4342.568923950195,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b25769d8.6df3c8",
+    "id": "e32197a7.4c81d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4716.850311279297,
-    "y": 4326.283172607422,
-    "z": "4138d8f7.da252",
+    "x": 4799.916976928711,
+    "y": 4408.568923950195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "201cbbc6.38c61c",
+    "id": "c808b6be.91a2f",
     "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": 5247.850067138672,
-    "y": 4328.283172607422,
-    "z": "4138d8f7.da252",
+    "x": 5330.916732788086,
+    "y": 4410.568923950195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "823be1e9.77a818",
-        "82dbf116.45c298"
+        "81cfd436.09d848",
+        "56387492.e922bc"
       ]
     ]
   },
   {
-    "id": "823be1e9.77a818",
+    "id": "81cfd436.09d848",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5372.850067138672,
-    "y": 4226.282928466797,
-    "z": "4138d8f7.da252",
+    "x": 5455.916732788086,
+    "y": 4308.56867980957,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ea4b8bb2.02c728"
+        "f77cd261.9bc248"
       ]
     ]
   },
   {
-    "id": "82dbf116.45c298",
+    "id": "56387492.e922bc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5491.85009765625,
-    "y": 4300.282958984375,
-    "z": "4138d8f7.da252",
+    "x": 5574.916763305664,
+    "y": 4382.568710327148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "12318d1c.9b97cb",
+    "id": "ebf96cf8.b5e018",
     "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": 4460.533203125,
-    "y": 3872,
-    "z": "4138d8f7.da252",
+    "x": 4543.599868774414,
+    "y": 3954.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "1c49d26a.15504e",
+    "id": "305ba790.74ff78",
     "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": 4805.533203125,
-    "y": 3734,
-    "z": "4138d8f7.da252",
+    "x": 4888.599868774414,
+    "y": 3816.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ee8d9735.9d0e18"
+        "810cd856.9ccc78"
       ]
     ]
   },
   {
-    "id": "75d5369a.76387",
+    "id": "c7beb2fc.58c5e",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4512.533203125,
-    "y": 3728,
-    "z": "4138d8f7.da252",
+    "x": 4595.599868774414,
+    "y": 3810.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1c49d26a.15504e"
+        "305ba790.74ff78"
       ]
     ]
   },
   {
-    "id": "2e9ad10b.18ccd6",
+    "id": "42cb0058.08b348",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4767.533203125,
-    "y": 3685,
-    "z": "4138d8f7.da252",
+    "x": 4850.599868774414,
+    "y": 3767.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "8bf9488.63f0cb8",
+    "id": "f96c39ea.1e754",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4456.533203125,
-    "y": 3780,
-    "z": "4138d8f7.da252",
+    "x": 4539.599868774414,
+    "y": 3862.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "4168ca78.86bd8c",
+    "id": "9b7536d9.f58d3",
     "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": 4464.533203125,
-    "y": 3825,
-    "z": "4138d8f7.da252",
+    "x": 4547.599868774414,
+    "y": 3907.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6e2860cf.ccae3",
+    "id": "78f36f08.9d23a",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4461.533203125,
-    "y": 3678,
-    "z": "4138d8f7.da252",
+    "x": 4544.599868774414,
+    "y": 3760.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ee8d9735.9d0e18",
+    "id": "810cd856.9ccc78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4714.533203125,
-    "y": 3802,
-    "z": "4138d8f7.da252",
+    "x": 4797.599868774414,
+    "y": 3884.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "16183a46.3a0a2e"
+        "842c0b07.9daf5"
       ]
     ]
   },
   {
-    "id": "16183a46.3a0a2e",
+    "id": "842c0b07.9daf5",
     "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": 4899.533203125,
-    "y": 3801,
-    "z": "4138d8f7.da252",
+    "x": 4982.599868774414,
+    "y": 3883.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9cdceec0.5d3c1"
+        "effe4e96.61186"
       ]
     ]
   },
   {
-    "id": "9cdceec0.5d3c1",
+    "id": "effe4e96.61186",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5091.533203125,
-    "y": 3804,
-    "z": "4138d8f7.da252",
+    "x": 5174.599868774414,
+    "y": 3886.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a8a5fc36.2f7d"
+        "e837bc5d.d6f4a"
       ]
     ]
   },
   {
-    "id": "a8a5fc36.2f7d",
+    "id": "e837bc5d.d6f4a",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5263.533203125,
-    "y": 3800,
-    "z": "4138d8f7.da252",
+    "x": 5346.599868774414,
+    "y": 3882.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "eb8710b8.36ef48",
+    "id": "5ae03ba5.e05364",
     "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": 4639.533203125,
-    "y": 3915,
-    "z": "4138d8f7.da252",
+    "x": 4722.599868774414,
+    "y": 3997.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "616a588c.b788e8",
+    "id": "407839fb.167e2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4156.533203125,
-    "y": 3700,
-    "z": "4138d8f7.da252",
+    "x": 4239.599868774414,
+    "y": 3782.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "711898b1.a3a988",
-        "c5e1be90.cd78d",
-        "8bf9488.63f0cb8",
-        "4168ca78.86bd8c",
-        "12318d1c.9b97cb",
-        "75d5369a.76387",
-        "eb8710b8.36ef48"
+        "873e71a3.8a59a",
+        "2ae96c09.c29bbc",
+        "f96c39ea.1e754",
+        "9b7536d9.f58d3",
+        "ebf96cf8.b5e018",
+        "c7beb2fc.58c5e",
+        "5ae03ba5.e05364"
       ]
     ]
   },
   {
-    "id": "d9429d2a.b15568",
+    "id": "78165047.ec87e8",
     "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": 4141.533203125,
-    "y": 3634,
-    "z": "4138d8f7.da252",
+    "x": 4224.599868774414,
+    "y": 3716.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c5e1be90.cd78d",
+    "id": "2ae96c09.c29bbc",
     "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": 4520.533203125,
-    "y": 3621,
-    "z": "4138d8f7.da252",
+    "x": 4603.599868774414,
+    "y": 3703.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d0e253fc.83209",
-        "415d3771.16041",
-        "2e9ad10b.18ccd6"
+        "d4c85a8.dd0a8a8",
+        "e8890a4e.1d2fd",
+        "42cb0058.08b348"
       ]
     ]
   },
   {
-    "id": "d0e253fc.83209",
+    "id": "d4c85a8.dd0a8a8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4756.533203125,
-    "y": 3604,
-    "z": "4138d8f7.da252",
+    "x": 4839.599868774414,
+    "y": 3686.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "415d3771.16041",
+    "id": "e8890a4e.1d2fd",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4753.533203125,
-    "y": 3645,
-    "z": "4138d8f7.da252",
+    "x": 4836.599868774414,
+    "y": 3727.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "711898b1.a3a988",
+    "id": "873e71a3.8a59a",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4469.533203125,
-    "y": 3578,
-    "z": "4138d8f7.da252",
+    "x": 4552.599868774414,
+    "y": 3660.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6bda79b8.645a68",
+    "id": "86fc32b9.5b11e8",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5198.93310546875,
-    "y": 4627.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5281.999771118164,
+    "y": 4709.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "94dec63b.8ae1e",
+    "id": "3b9c82f6.e6f406",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4987.93310546875,
-    "y": 4689.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5070.999771118164,
+    "y": 4771.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5b09d63.4152d28"
+        "1361709c.aa1da7"
       ]
     ]
   },
   {
-    "id": "5b09d63.4152d28",
+    "id": "1361709c.aa1da7",
     "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": 5231.93310546875,
-    "y": 4695.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5314.999771118164,
+    "y": 4777.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4ce07cc6.c3d424",
-        "f554a368.1a08c8"
+        "65e42246.3bc70c",
+        "4c5853af.96f634"
       ]
     ]
   },
   {
-    "id": "4ce07cc6.c3d424",
+    "id": "65e42246.3bc70c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5462.93310546875,
-    "y": 4673.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5545.999771118164,
+    "y": 4755.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e736f8f3.ed2808"
+        "86c13c.8334e6c8"
       ]
     ]
   },
   {
-    "id": "f554a368.1a08c8",
+    "id": "4c5853af.96f634",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5467.93310546875,
-    "y": 4740.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5550.999771118164,
+    "y": 4822.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a82e0bf.f144f",
+    "id": "c5f7e346.0cad5",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5716.816864013672,
-    "y": 4238.082244873047,
-    "z": "4138d8f7.da252",
+    "x": 5799.883529663086,
+    "y": 4320.36799621582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8b36e42.8d18318",
-        "9e33af49.9f241"
+        "36b3fe84.38d7ba",
+        "4dc5480c.f82fe8"
       ]
     ]
   },
   {
-    "id": "8b36e42.8d18318",
+    "id": "36b3fe84.38d7ba",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5871.81689453125,
-    "y": 4166.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 5954.883560180664,
+    "y": 4248.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b40b55f7.23af98"
+        "55b477cf.ef13f8"
       ]
     ]
   },
   {
-    "id": "9e33af49.9f241",
+    "id": "4dc5480c.f82fe8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5872.81689453125,
-    "y": 4299.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 5955.883560180664,
+    "y": 4381.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b38dd55a.418b38"
+        "c669d5e6.7b56e8"
       ]
     ]
   },
   {
-    "id": "b40b55f7.23af98",
+    "id": "55b477cf.ef13f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6016.81689453125,
-    "y": 4166.082763671875,
-    "z": "4138d8f7.da252",
+    "x": 6099.883560180664,
+    "y": 4248.368515014648,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3913dc06.a223d4",
-        "839acfd7.2291a"
+        "13bb5bff.e1f664",
+        "d1738758.598cd8"
       ]
     ]
   },
   {
-    "id": "3913dc06.a223d4",
+    "id": "13bb5bff.e1f664",
     "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": 6309.81689453125,
-    "y": 4144.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 6392.883560180664,
+    "y": 4226.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "839acfd7.2291a",
+    "id": "d1738758.598cd8",
     "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": 6261.466796875,
-    "y": 4191.3994140625,
-    "z": "4138d8f7.da252",
+    "x": 6344.533462524414,
+    "y": 4273.685165405273,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4d10eebf.474a88",
+    "id": "c20dae0a.c8db1",
     "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": 6334.816864013672,
-    "y": 4093.082244873047,
-    "z": "4138d8f7.da252",
+    "x": 6417.883529663086,
+    "y": 4175.36799621582,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b38dd55a.418b38",
+    "id": "c669d5e6.7b56e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6028.81689453125,
-    "y": 4298.082763671875,
-    "z": "4138d8f7.da252",
+    "x": 6111.883560180664,
+    "y": 4380.368515014648,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8675cc13.463188",
-        "35c1f8d2.a502"
+        "fbd54f6b.bd5de8",
+        "4b0d9778.02ef98"
       ]
     ]
   },
   {
-    "id": "8675cc13.463188",
+    "id": "fbd54f6b.bd5de8",
     "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": 6321.81689453125,
-    "y": 4276.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 6404.883560180664,
+    "y": 4358.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "35c1f8d2.a502",
+    "id": "4b0d9778.02ef98",
     "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": 6273.466796875,
-    "y": 4323.3994140625,
-    "z": "4138d8f7.da252",
+    "x": 6356.533462524414,
+    "y": 4405.685165405273,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "b5ed36f4.c5e02",
+    "id": "2c35c11.f28a13e",
     "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": 6345.81689453125,
-    "y": 4237.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 6428.883560180664,
+    "y": 4319.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e736f8f3.ed2808",
+    "id": "86c13c.8334e6c8",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5668.0498046875,
-    "y": 4680.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5751.116470336914,
+    "y": 4762.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c39fa1bf.775f28",
-        "760b6a69.a4fd14"
+        "f84ec623.3e0358",
+        "579a6f55.5876b8"
       ]
     ]
   },
   {
-    "id": "c39fa1bf.775f28",
+    "id": "f84ec623.3e0358",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5863.0498046875,
-    "y": 4608.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5946.116470336914,
+    "y": 4690.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "903811e2.41d4e8"
+        "7ac296e6.db7d4"
       ]
     ]
   },
   {
-    "id": "760b6a69.a4fd14",
+    "id": "579a6f55.5876b8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5864.0498046875,
-    "y": 4741.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5947.116470336914,
+    "y": 4823.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8a352d04.a7b5f"
+        "63acc8c1.d0489"
       ]
     ]
   },
   {
-    "id": "903811e2.41d4e8",
+    "id": "7ac296e6.db7d4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6008.0498046875,
-    "y": 4608.283447265625,
-    "z": "4138d8f7.da252",
+    "x": 6091.116470336914,
+    "y": 4690.569198608398,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dd052918.eeeec8",
-        "5b6d1623.4afde8"
+        "7470326b.50fd4c",
+        "6067f5da.462f2c"
       ]
     ]
   },
   {
-    "id": "dd052918.eeeec8",
+    "id": "7470326b.50fd4c",
     "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": 6301.0498046875,
-    "y": 4586.283203125,
-    "z": "4138d8f7.da252",
+    "x": 6384.116470336914,
+    "y": 4668.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b6d1623.4afde8",
+    "id": "6067f5da.462f2c",
     "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": 6252.69970703125,
-    "y": 4633.60009765625,
-    "z": "4138d8f7.da252",
+    "x": 6335.766372680664,
+    "y": 4715.885848999023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f8433708.1cf278",
+    "id": "b621fab3.fd22d8",
     "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": 6325.0498046875,
-    "y": 4547.283203125,
-    "z": "4138d8f7.da252",
+    "x": 6408.116470336914,
+    "y": 4629.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8a352d04.a7b5f",
+    "id": "63acc8c1.d0489",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6020.0498046875,
-    "y": 4740.283447265625,
-    "z": "4138d8f7.da252",
+    "x": 6103.116470336914,
+    "y": 4822.569198608398,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1797ce6f.bf55da",
-        "f850925d.eaddb8"
+        "ab9c7cb.6ee1c8",
+        "478e555b.00c56c"
       ]
     ]
   },
   {
-    "id": "1797ce6f.bf55da",
+    "id": "ab9c7cb.6ee1c8",
     "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": 6313.0498046875,
-    "y": 4718.283203125,
-    "z": "4138d8f7.da252",
+    "x": 6396.116470336914,
+    "y": 4800.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f850925d.eaddb8",
+    "id": "478e555b.00c56c",
     "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": 6264.69970703125,
-    "y": 4765.60009765625,
-    "z": "4138d8f7.da252",
+    "x": 6347.766372680664,
+    "y": 4847.885848999023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "98f83ad6.f376c",
+    "id": "57c5a214.d70e3c",
     "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": 6337.0498046875,
-    "y": 4679.283203125,
-    "z": "4138d8f7.da252",
+    "x": 6420.116470336914,
+    "y": 4761.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f3a92d2f.d14e78",
+    "id": "b34554cf.aa2d2",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5075.89990234375,
-    "y": 5420.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 5158.966567993164,
+    "y": 5502.769149780273,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cfcbce5e.a3353",
+    "id": "613e9b77.298d54",
     "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": 5073.68310546875,
-    "y": 5460.68359375,
-    "z": "4138d8f7.da252",
+    "x": 5156.749771118164,
+    "y": 5542.969345092773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "35bf741d.0589dc",
+    "id": "95d677c9.726458",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4948.933349609375,
-    "y": 5645.16650390625,
-    "z": "4138d8f7.da252",
+    "x": 5032.000015258789,
+    "y": 5727.452255249023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "58a0b8d5.3916c8",
+    "id": "6712b992.157",
     "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": 4946.716552734375,
-    "y": 5685.36669921875,
-    "z": "4138d8f7.da252",
+    "x": 5029.783218383789,
+    "y": 5767.652450561523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "141a3bed.ea5a94",
+    "id": "abfdee17.12df08",
     "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": 5046.0498046875,
-    "y": 5969.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5129.116470336914,
+    "y": 6051.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "8127bfc.2c0cdc",
+    "id": "1b1c3355.4ab2b5",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4873.0498046875,
-    "y": 6026.283203125,
-    "z": "4138d8f7.da252",
+    "x": 4956.116470336914,
+    "y": 6108.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "eb3bc0b8.920088",
-        "e32169bb.0af1a8"
+        "5c00f9d2.103a1",
+        "4db44e39.57056"
       ]
     ]
   },
   {
-    "id": "eb3bc0b8.920088",
+    "id": "5c00f9d2.103a1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5084.0498046875,
-    "y": 6026.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5167.116470336914,
+    "y": 6108.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2548cb5a.7d91a4"
+        "e62c2a04.834ba8"
       ]
     ]
   },
   {
-    "id": "e32169bb.0af1a8",
+    "id": "4db44e39.57056",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5080.0498046875,
-    "y": 6074.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5163.116470336914,
+    "y": 6156.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6b0e17ed.7e019"
+        "2dd9a1ca.3380de"
       ]
     ]
   },
   {
-    "id": "2548cb5a.7d91a4",
+    "id": "e62c2a04.834ba8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5240.0498046875,
-    "y": 6022.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5323.116470336914,
+    "y": 6104.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4736668b.da34e8",
-        "d60814f1.44b368",
-        "3b369b46.f16d74"
+        "59a4f603.629458",
+        "cf3067c2.3ee01",
+        "b81f8f7c.c8bbe"
       ]
     ]
   },
   {
-    "id": "6b0e17ed.7e019",
+    "id": "2dd9a1ca.3380de",
     "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": 5228.0498046875,
-    "y": 6069.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5311.116470336914,
+    "y": 6151.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b390ff23.8e635",
+    "id": "4526cd48.9f1514",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5505.93359375,
-    "y": 6122.16650390625,
-    "z": "4138d8f7.da252",
+    "x": 5589.000259399414,
+    "y": 6204.452255249023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3b369b46.f16d74",
+    "id": "b81f8f7c.c8bbe",
     "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": 5503.716796875,
-    "y": 6162.36669921875,
-    "z": "4138d8f7.da252",
+    "x": 5586.783462524414,
+    "y": 6244.652450561523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d60814f1.44b368",
+    "id": "cf3067c2.3ee01",
     "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": 5623.0498046875,
-    "y": 6074.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5706.116470336914,
+    "y": 6156.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4736668b.da34e8",
+    "id": "59a4f603.629458",
     "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": 5494.0498046875,
-    "y": 6022.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5577.116470336914,
+    "y": 6104.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "85c984f2.33f7c8",
+    "id": "67b13c77.507314",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4935.0498046875,
-    "y": 5927.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5018.116470336914,
+    "y": 6009.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f942597e.1aa18",
+    "id": "e11abdc.71e19c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4582.3828125,
-    "y": 6014.283203125,
-    "z": "4138d8f7.da252",
+    "x": 4665.449478149414,
+    "y": 6096.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "141a3bed.ea5a94",
-        "8127bfc.2c0cdc",
-        "8afd899a.01e88",
-        "8c1f115c.700108"
+        "abfdee17.12df08",
+        "1b1c3355.4ab2b5",
+        "b5179b.b5811868",
+        "8a0b9185.29b548"
       ]
     ]
   },
   {
-    "id": "fc4aa587.17d69",
+    "id": "6a0cb0e4.5bec78",
     "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": 4926.13330078125,
-    "y": 6483.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5009.199966430664,
+    "y": 6565.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "41ec9458.f731e4",
+    "id": "4b79bf18.1b12f8",
     "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": 3631.500457763672,
-    "y": 3759.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 3714.567123413086,
+    "y": 3842.2857208251953,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "23b69bc.0871b64",
+    "id": "931a7a68.51c848",
     "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": 4384.033660888672,
-    "y": 4034.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4467.100326538086,
+    "y": 4116.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "75525335.c9aa54",
-        "d5340ebc.32553",
-        "f8167756.f35bd8"
+        "810ab4c1.abf7e",
+        "4e13a1b8.dde8c",
+        "e5e81f70.f40458"
       ]
     ]
   },
   {
-    "id": "977709e8.5868c",
+    "id": "c0e77edb.5b02c",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4492.033905029297,
-    "y": 3990.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4575.100570678711,
+    "y": 4072.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "75525335.c9aa54",
+    "id": "810ab4c1.abf7e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4589.033660888672,
-    "y": 4031.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4672.100326538086,
+    "y": 4113.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b5414319.96d9"
+        "fa4e460e.6cd96"
       ]
     ]
   },
   {
-    "id": "d5340ebc.32553",
+    "id": "4e13a1b8.dde8c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4572.524627685547,
-    "y": 4092.690704345703,
-    "z": "4138d8f7.da252",
+    "x": 4655.591293334961,
+    "y": 4174.976455688477,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a327dd9c.9d096"
+        "4d1c0281.9a84bc"
       ]
     ]
   },
   {
-    "id": "f8167756.f35bd8",
+    "id": "e5e81f70.f40458",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4570.033660888672,
-    "y": 4136.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4653.100326538086,
+    "y": 4218.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "784d31ab.abb97"
+        "5961321d.8806a4"
       ]
     ]
   },
   {
-    "id": "b5414319.96d9",
+    "id": "fa4e460e.6cd96",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4757.033905029297,
-    "y": 4026.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4840.100570678711,
+    "y": 4108.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "98142959.81fca"
+        "4d09e7f7.7140b8"
       ]
     ]
   },
   {
-    "id": "a327dd9c.9d096",
+    "id": "4d1c0281.9a84bc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4735.096038818359,
-    "y": 4092.9764404296875,
-    "z": "4138d8f7.da252",
+    "x": 4818.162704467773,
+    "y": 4175.262191772461,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "784d31ab.abb97",
+    "id": "5961321d.8806a4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4737.033660888672,
-    "y": 4135.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4820.100326538086,
+    "y": 4217.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "98142959.81fca",
+    "id": "4d09e7f7.7140b8",
     "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": 4995.033905029297,
-    "y": 4031.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5078.100570678711,
+    "y": 4113.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6df0b8a0.a7c62"
+        "45b87759.5a906"
       ]
     ]
   },
   {
-    "id": "6df0b8a0.a7c62",
+    "id": "45b87759.5a906",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5229.033660888672,
-    "y": 4038.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5312.100326538086,
+    "y": 4120.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "201cbbc6.38c61c"
+        "c808b6be.91a2f"
       ]
     ]
   },
   {
-    "id": "92806e4e.351398",
+    "id": "f4ea682a.e63f08",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4362.733367919922,
-    "y": 3960.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4445.800033569336,
+    "y": 4042.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f43de449.20024",
+    "id": "1d230bf5.a23cfc",
     "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": 5645.883270263672,
-    "y": 4048.699676513672,
-    "z": "4138d8f7.da252",
+    "x": 5728.949935913086,
+    "y": 4130.985427856445,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7a53ecb2.cec2c4"
+        "516d68ca.7c7f6"
       ]
     ]
   },
   {
-    "id": "7a53ecb2.cec2c4",
+    "id": "516d68ca.7c7f6",
     "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": 5837.883270263672,
-    "y": 4037.699920654297,
-    "z": "4138d8f7.da252",
+    "x": 5920.949935913086,
+    "y": 4119.98567199707,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "700641c0.5a055"
+        "39e7022f.c30a2e"
       ]
     ]
   },
   {
-    "id": "700641c0.5a055",
+    "id": "39e7022f.c30a2e",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6019.883270263672,
-    "y": 4016.699920654297,
-    "z": "4138d8f7.da252",
+    "x": 6102.949935913086,
+    "y": 4098.98567199707,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9920129e.a09"
+        "455228ea.3ce16"
       ]
     ]
   },
   {
-    "id": "9920129e.a09",
+    "id": "455228ea.3ce16",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6181.883270263672,
-    "y": 4005.699920654297,
-    "z": "4138d8f7.da252",
+    "x": 6264.949935913086,
+    "y": 4087.9856719970703,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7f7dfee.7fba8",
-        "c8f259e.2871ba8"
+        "826e861c.8cb3f8",
+        "78a2c33b.328edc"
       ]
     ]
   },
   {
-    "id": "7f7dfee.7fba8",
+    "id": "826e861c.8cb3f8",
     "type": "set",
     "name": "unset tmp.the-connectivity",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
     "comments": "",
-    "x": 6378.883270263672,
-    "y": 3934.699920654297,
-    "z": "4138d8f7.da252",
+    "x": 6461.949935913086,
+    "y": 4016.9856719970703,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "335b26db.86f24a",
+    "id": "d1bcb0d5.b833a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5552.833465576172,
-    "y": 4163.699676513672,
-    "z": "4138d8f7.da252",
+    "x": 5635.900131225586,
+    "y": 4245.985427856445,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4a82e0bf.f144f",
-        "f43de449.20024",
-        "1e79d0a7.c66727",
-        "7f90edcc.1e82b4"
+        "c5f7e346.0cad5",
+        "1d230bf5.a23cfc",
+        "1966547c.c3884c",
+        "d31d83e1.8d9b98"
       ]
     ]
   },
   {
-    "id": "1e79d0a7.c66727",
+    "id": "1966547c.c3884c",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5684.399871826172,
-    "y": 3938.916717529297,
-    "z": "4138d8f7.da252",
+    "x": 5767.466537475586,
+    "y": 4021.2024688720703,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7f90edcc.1e82b4",
+    "id": "d31d83e1.8d9b98",
     "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": 5676.399871826172,
-    "y": 3987.916717529297,
-    "z": "4138d8f7.da252",
+    "x": 5759.466537475586,
+    "y": 4070.2024688720703,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c8f259e.2871ba8",
+    "id": "78a2c33b.328edc",
     "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": 6384.350067138672,
-    "y": 4043.916717529297,
-    "z": "4138d8f7.da252",
+    "x": 6467.416732788086,
+    "y": 4126.20246887207,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a412e157.cf47d8",
+    "id": "b4318014.e1a038",
     "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": 5677.616668701172,
-    "y": 3762.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5760.683334350586,
+    "y": 3844.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6887559d.aa01b4",
+    "id": "985ed7d4.ec17a",
     "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": 5831.616668701172,
-    "y": 3814.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5914.683334350586,
+    "y": 3896.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea4b8bb2.02c728",
+    "id": "f77cd261.9bc248",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5422.616668701172,
-    "y": 3881.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5505.683334350586,
+    "y": 3963.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6887559d.aa01b4",
-        "d154a2e6.a2bcc",
-        "a412e157.cf47d8"
+        "985ed7d4.ec17a",
+        "543e7c89.750024",
+        "b4318014.e1a038"
       ]
     ]
   },
   {
-    "id": "d154a2e6.a2bcc",
+    "id": "543e7c89.750024",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5676.616668701172,
-    "y": 3869.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5759.683334350586,
+    "y": 3951.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "89918c5f.33a478"
+        "8bf41864.55ad6"
       ]
     ]
   },
   {
-    "id": "89918c5f.33a478",
+    "id": "8bf41864.55ad6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5855.616668701172,
-    "y": 3868.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5938.683334350586,
+    "y": 3950.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "335b26db.86f24a"
+        "d1bcb0d5.b833a"
       ]
     ]
   },
   {
-    "id": "2fafeba7.6be734",
+    "id": "fc947668.8a9d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4553.616668701172,
-    "y": 7386.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4636.683334350586,
+    "y": 7468.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "18db3335.23915d",
-        "d2fe4c45.697938",
-        "175608de.c2a5b7"
+        "9818a5dd.1c569",
+        "2b482f66.6e7e5",
+        "43c9acaa.ef761c"
       ]
     ]
   },
   {
-    "id": "175608de.c2a5b7",
+    "id": "43c9acaa.ef761c",
     "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": 4776.616668701172,
-    "y": 7330.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4859.683334350586,
+    "y": 7412.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "18db3335.23915d",
+    "id": "9818a5dd.1c569",
     "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": 4955.616668701172,
-    "y": 7373.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5038.683334350586,
+    "y": 7455.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d2fe4c45.697938",
+    "id": "2b482f66.6e7e5",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4800.616668701172,
-    "y": 7428.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4883.683334350586,
+    "y": 7510.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5916bddb.120d64"
+        "e0a7a605.9205d8"
       ]
     ]
   },
   {
-    "id": "5916bddb.120d64",
+    "id": "e0a7a605.9205d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4979.616668701172,
-    "y": 7427.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5062.683334350586,
+    "y": 7509.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "997dfd42.35e9c"
+        "86241828.71762"
       ]
     ]
   },
   {
-    "id": "afa717d0.25e7a8",
+    "id": "811fcd41.48413",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4710.616668701172,
-    "y": 7066.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4793.683334350586,
+    "y": 7148.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "46e10049.e35348",
+    "id": "9cc0dadb.189ef",
     "type": "set",
     "name": "unset secondary related variables",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
     "comments": "",
-    "x": 3276.2332763671875,
-    "y": 460.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 3359.2999420166016,
+    "y": 542.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "26a90c3.2a56674",
+    "id": "79c99b01.4060a4",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4051.332763671875,
-    "y": 521.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 4134.399429321289,
+    "y": 603.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "949451da.c153b8"
+        "4bbb66bd.93eca"
       ]
     ]
   },
   {
-    "id": "949451da.c153b8",
+    "id": "4bbb66bd.93eca",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4220.332763671875,
-    "y": 518.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 4303.399429321289,
+    "y": 600.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "33bf54d9.6913cc",
-        "9e64bdfc.fb79a8"
+        "506bfd50.24ebdc",
+        "e2033e30.afcd1"
       ]
     ]
   },
   {
-    "id": "33bf54d9.6913cc",
+    "id": "506bfd50.24ebdc",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4444.332763671875,
-    "y": 551.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 4527.399429321289,
+    "y": 633.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9e64bdfc.fb79a8",
+    "id": "e2033e30.afcd1",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4390.332763671875,
-    "y": 591.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 4473.399429321289,
+    "y": 673.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "16154f9d.14a3b",
+    "id": "fb5e94da.526bd",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4016.333251953125,
-    "y": 720.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 4099.399917602539,
+    "y": 803.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "85975abf.6c518"
+        "2507bbe.52fb3c4"
       ]
     ]
   },
   {
-    "id": "85975abf.6c518",
+    "id": "2507bbe.52fb3c4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4181.33251953125,
-    "y": 725.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 4264.399185180664,
+    "y": 808.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "adebbb96.d8f2f",
-        "88877892.df83d8"
+        "93fd5f76.e542d8",
+        "736d4375.48de7c"
       ]
     ]
   },
   {
-    "id": "adebbb96.d8f2f",
+    "id": "93fd5f76.e542d8",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4428.332763671875,
-    "y": 807.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 4511.399429321289,
+    "y": 890.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "88877892.df83d8",
+    "id": "736d4375.48de7c",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4374.332763671875,
-    "y": 847.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 4457.399429321289,
+    "y": 930.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f55201f.0be188",
+    "id": "e9c6a99.90dcbd8",
     "type": "save",
     "name": "get network-route-three from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
     "comments": "",
     "outputs": 1,
-    "x": 3259.333251953125,
-    "y": 859.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 3342.399917602539,
+    "y": 942.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e0b52eb6.aea228",
-        "c2961466.a099a8",
-        "6a533bc.97a86c4"
+        "554ea6a8.9888f",
+        "3be7a41.d9c04dc",
+        "65e70654.5cdcc8"
       ]
     ]
   },
   {
-    "id": "e0b52eb6.aea228",
+    "id": "554ea6a8.9888f",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3501.333251953125,
-    "y": 852.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 3584.399917602539,
+    "y": 935.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "c2961466.a099a8",
+    "id": "3be7a41.d9c04dc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3496.842315673828,
-    "y": 895.1927185058594,
-    "z": "4138d8f7.da252",
+    "x": 3579.908981323242,
+    "y": 977.4784698486328,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "6a533bc.97a86c4",
+    "id": "65e70654.5cdcc8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3500.84228515625,
-    "y": 943.1926879882812,
-    "z": "4138d8f7.da252",
+    "x": 3583.908950805664,
+    "y": 1025.4784393310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "83cc008.07d49"
+        "834a986c.4e7048"
       ]
     ]
   },
   {
-    "id": "83cc008.07d49",
+    "id": "834a986c.4e7048",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3662.333251953125,
-    "y": 883.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 3745.399917602539,
+    "y": 966.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2318951c.d8223a"
+        "f5a8155b.186e1"
       ]
     ]
   },
   {
-    "id": "2318951c.d8223a",
+    "id": "f5a8155b.186e1",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3833.333251953125,
-    "y": 883.766845703125,
-    "z": "4138d8f7.da252",
+    "x": 3916.399917602539,
+    "y": 966.0525970458984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1ecaee8d.2e04b1",
-        "6f57dead.f93a98",
-        "743eca24.c93994"
+        "49a01940.91879",
+        "fb61a82e.a48e6",
+        "bf3bb014.cd44d"
       ]
     ]
   },
   {
-    "id": "1ecaee8d.2e04b1",
+    "id": "49a01940.91879",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4000.3330078125,
-    "y": 793.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4083.399673461914,
+    "y": 876.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ced307c.4c3f7f8"
+        "13796778.1bcaa1"
       ]
     ]
   },
   {
-    "id": "6f57dead.f93a98",
+    "id": "fb61a82e.a48e6",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4002.3330078125,
-    "y": 847.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4085.399673461914,
+    "y": 930.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e2f995cd.e955"
+        "dfa37602.2a592"
       ]
     ]
   },
   {
-    "id": "ced307c.4c3f7f8",
+    "id": "13796778.1bcaa1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4128.3330078125,
-    "y": 793.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4211.399673461914,
+    "y": 876.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "36a6204d.62e268",
-        "94b8b644.43f75"
+        "c61c7290.5d0048",
+        "9330928e.78e4a8"
       ]
     ]
   },
   {
-    "id": "e2f995cd.e955",
+    "id": "dfa37602.2a592",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4131.3330078125,
-    "y": 846.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4214.399673461914,
+    "y": 929.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7b0ab608.42ea9",
-        "a90ad8f1.fdc558"
+        "b3bef05d.261898",
+        "4885c383.a5f124"
       ]
     ]
   },
   {
-    "id": "94b8b644.43f75",
+    "id": "9330928e.78e4a8",
     "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": 4374.332763671875,
-    "y": 932.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4457.399429321289,
+    "y": 1015.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7b0ab608.42ea9",
+    "id": "b3bef05d.261898",
     "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": 4391.332763671875,
-    "y": 974.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4474.399429321289,
+    "y": 1057.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a90ad8f1.fdc558",
+    "id": "4885c383.a5f124",
     "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": 4376.332763671875,
-    "y": 1012.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4459.399429321289,
+    "y": 1095.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "36a6204d.62e268",
+    "id": "c61c7290.5d0048",
     "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": 4388.332763671875,
-    "y": 892.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4471.399429321289,
+    "y": 975.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "467d675.a17d518",
+    "id": "3c2a776f.fcd778",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4553.332763671875,
-    "y": 908.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4636.399429321289,
+    "y": 991.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "743eca24.c93994",
+    "id": "bf3bb014.cd44d",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3941.333251953125,
-    "y": 938.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 4024.399917602539,
+    "y": 1021.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "32cfa81c.1fdfe"
+        "4b490f7e.359388"
       ]
     ]
   },
   {
-    "id": "32cfa81c.1fdfe",
+    "id": "4b490f7e.359388",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4115.333251953125,
-    "y": 933.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 4198.399917602539,
+    "y": 1016.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7ba10fb0.49acb8",
-        "c1eb138a.5c454"
+        "14062c05.c0d224",
+        "a29138d9.9f86a8"
       ]
     ]
   },
   {
-    "id": "c1eb138a.5c454",
+    "id": "a29138d9.9f86a8",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4348.332763671875,
-    "y": 1102.7665405273438,
-    "z": "4138d8f7.da252",
+    "x": 4431.399429321289,
+    "y": 1185.0522918701172,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7ba10fb0.49acb8",
+    "id": "14062c05.c0d224",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4402.332763671875,
-    "y": 1062.7665405273438,
-    "z": "4138d8f7.da252",
+    "x": 4485.399429321289,
+    "y": 1145.0522918701172,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f3ed1968.f2e4c",
+    "id": "de8acab8.aa46c",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4516.332763671875,
-    "y": 1087.7665405273438,
-    "z": "4138d8f7.da252",
+    "x": 4599.399429321289,
+    "y": 1170.0522918701172,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9301f497.efdba",
+    "id": "fd1dbeb5.643a7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3517,
-    "y": 2168,
-    "z": "4138d8f7.da252",
+    "x": 3600.066665649414,
+    "y": 2250.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7448f46b.34e6cc",
-        "5277238e.78ec8c"
+        "c723b1c5.5db71",
+        "935dac93.06ba68"
       ]
     ]
   },
   {
-    "id": "48753b32.6fce64",
+    "id": "bc4d7dbf.afb29",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3344.33349609375,
-    "y": 2169,
-    "z": "4138d8f7.da252",
+    "x": 3427.400161743164,
+    "y": 2251.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9301f497.efdba"
+        "fd1dbeb5.643a7"
       ]
     ]
   },
   {
-    "id": "7b2bdccd.4a3854",
+    "id": "e6ea02c1.c3c8b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3353.824462890625,
-    "y": 2211.5740356445312,
-    "z": "4138d8f7.da252",
+    "x": 3436.891128540039,
+    "y": 2293.8597869873047,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "9a4a0275.086048",
+    "id": "4af5d292.f0e44c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3342.33349609375,
-    "y": 2258,
-    "z": "4138d8f7.da252",
+    "x": 3425.400161743164,
+    "y": 2340.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "7448f46b.34e6cc",
+    "id": "c723b1c5.5db71",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3803.33349609375,
-    "y": 2172.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3886.400161743164,
+    "y": 2254.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "645217a3.91825",
-        "af1d3f52.b0745"
+        "e1f3a987.bed2a8",
+        "cd75a949.bbc878"
       ]
     ]
   },
   {
-    "id": "af1d3f52.b0745",
+    "id": "cd75a949.bbc878",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4026.33349609375,
-    "y": 2127.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4109.400161743164,
+    "y": 2209.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "731452c3.85af84"
+        "c2b43a53.588108"
       ]
     ]
   },
   {
-    "id": "645217a3.91825",
+    "id": "e1f3a987.bed2a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4028.33349609375,
-    "y": 2191.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4111.400161743164,
+    "y": 2273.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6089c716.00dec8"
+        "183afe84.247bf9"
       ]
     ]
   },
   {
-    "id": "fa7f428c.6d6b2",
+    "id": "25934f35.38edd",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3116.33349609375,
-    "y": 2204,
-    "z": "4138d8f7.da252",
+    "x": 3199.400161743164,
+    "y": 2286.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "48753b32.6fce64",
-        "7b2bdccd.4a3854",
-        "9a4a0275.086048"
+        "bc4d7dbf.afb29",
+        "e6ea02c1.c3c8b",
+        "4af5d292.f0e44c"
       ]
     ]
   },
   {
-    "id": "c73afdde.7fd758",
+    "id": "e6f36ca.9e7909",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3077.33349609375,
-    "y": 2148,
-    "z": "4138d8f7.da252",
+    "x": 3160.400161743164,
+    "y": 2230.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6834572.668ee28",
+    "id": "4a92500a.dfe688",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3136.33349609375,
-    "y": 1944,
-    "z": "4138d8f7.da252",
+    "x": 3219.400161743164,
+    "y": 2026.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2bef51bc.6ca236",
-        "6cf1c76e.88753"
+        "f38e9f0f.aeb28",
+        "c00bcf8d.007da8"
       ]
     ]
   },
   {
-    "id": "6cf1c76e.88753",
+    "id": "c00bcf8d.007da8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3359.33349609375,
-    "y": 1930,
-    "z": "4138d8f7.da252",
+    "x": 3442.400161743164,
+    "y": 2012.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f6f8952c.2953"
+        "8c221cd.f6641e"
       ]
     ]
   },
   {
-    "id": "2bef51bc.6ca236",
+    "id": "f38e9f0f.aeb28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3361.33349609375,
-    "y": 1963,
-    "z": "4138d8f7.da252",
+    "x": 3444.400161743164,
+    "y": 2045.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f6f8952c.2953",
+    "id": "8c221cd.f6641e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3507.33349609375,
-    "y": 1923,
-    "z": "4138d8f7.da252",
+    "x": 3590.400161743164,
+    "y": 2005.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f448bb3c.4541c8",
-        "dafe2b52.c4e9d"
+        "7fdb72b7.69f4e4",
+        "70d5d0aa.d1559"
       ]
     ]
   },
   {
-    "id": "f448bb3c.4541c8",
+    "id": "7fdb72b7.69f4e4",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3701.33349609375,
-    "y": 1926.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3784.400161743164,
+    "y": 2008.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "5277238e.78ec8c",
+    "id": "935dac93.06ba68",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3754.333465576172,
-    "y": 2294.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 3837.400131225586,
+    "y": 2377.2857208251953,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "eb06fc3b.085ab"
+        "bb098115.17482"
       ]
     ]
   },
   {
-    "id": "eb06fc3b.085ab",
+    "id": "bb098115.17482",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3960.333465576172,
-    "y": 2294.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4043.400131225586,
+    "y": 2377.2857208251953,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a014a0c0.bb63d8"
+        "eb63cf64.6fcac8"
       ]
     ]
   },
   {
-    "id": "dafe2b52.c4e9d",
+    "id": "70d5d0aa.d1559",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3723.33349609375,
-    "y": 1994.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3806.400161743164,
+    "y": 2076.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a21fb44.41309c8",
-        "5685afe4.0b1f1",
-        "ea909548.33d5a"
+        "4772aa88.8815f4",
+        "2f88517d.a786fe",
+        "a51a10da.7f1bc8"
       ]
     ]
   },
   {
-    "id": "a21fb44.41309c8",
+    "id": "4772aa88.8815f4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3918.8336181640625,
-    "y": 1946.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4001.9002838134766,
+    "y": 2028.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9cea62e1.55972"
+        "bea56767.e75718"
       ]
     ]
   },
   {
-    "id": "5685afe4.0b1f1",
+    "id": "2f88517d.a786fe",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3910.8336181640625,
-    "y": 2001.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3993.9002838134766,
+    "y": 2083.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "89031999.da34c"
+        "3775c8.545c2238"
       ]
     ]
   },
   {
-    "id": "ea909548.33d5a",
+    "id": "a51a10da.7f1bc8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3915.8336181640625,
-    "y": 2058.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3998.9002838134766,
+    "y": 2140.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c3bf7f9d.8f5d8"
+        "afbc062e.468e"
       ]
     ]
   },
   {
-    "id": "c3bf7f9d.8f5d8",
+    "id": "afbc062e.468e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4067.8336181640625,
-    "y": 2059.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4150.900283813477,
+    "y": 2141.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9cea62e1.55972",
+    "id": "bea56767.e75718",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4063.2159423828125,
-    "y": 1943.6557922363281,
-    "z": "4138d8f7.da252",
+    "x": 4146.282608032227,
+    "y": 2025.9415435791016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e8d406ab.082b08"
+        "80389683.dd0d1"
       ]
     ]
   },
   {
-    "id": "8c5d257.6a579d8",
+    "id": "77f3463a.2b447",
     "type": "set",
     "name": "set SECONDARY-ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
     "comments": "",
-    "x": 3139,
-    "y": 2283,
-    "z": "4138d8f7.da252",
+    "x": 3222.066665649414,
+    "y": 2365.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "5e59531e.4360fc",
+    "id": "75f1943f.b94b8c",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3813.999969482422,
-    "y": 2246.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 3897.066635131836,
+    "y": 2329.2857208251953,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6089c716.00dec8",
+    "id": "183afe84.247bf9",
     "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": 4187.33349609375,
-    "y": 2210.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4270.400161743164,
+    "y": 2292.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "731452c3.85af84",
+    "id": "c2b43a53.588108",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4191.33349609375,
-    "y": 2124.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4274.400161743164,
+    "y": 2206.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8743a739.8d80e8",
-        "538193e1.eab6f4"
+        "62ce6308.22a894",
+        "3f411974.bc06ee"
       ]
     ]
   },
   {
-    "id": "a014a0c0.bb63d8",
+    "id": "eb63cf64.6fcac8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4177.619110107422,
-    "y": 2293.821746826172,
-    "z": "4138d8f7.da252",
+    "x": 4260.685775756836,
+    "y": 2376.1074981689453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "62c06921.59013"
+        "68a23803.3ba65"
       ]
     ]
   },
   {
-    "id": "89031999.da34c",
+    "id": "3775c8.545c2238",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4078.8336181640625,
-    "y": 2004.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4161.900283813477,
+    "y": 2086.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8743a739.8d80e8",
+    "id": "62ce6308.22a894",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
     "comments": "",
-    "x": 4361.33349609375,
-    "y": 2085.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4444.400161743164,
+    "y": 2167.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "538193e1.eab6f4",
+    "id": "3f411974.bc06ee",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
     "comments": "",
-    "x": 4362.33349609375,
-    "y": 2190.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4445.400161743164,
+    "y": 2272.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a7a60345.c4fe3",
+    "id": "6316b810.f1aee8",
     "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": 4357.33349609375,
-    "y": 2139.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4440.400161743164,
+    "y": 2221.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "62c06921.59013",
+    "id": "68a23803.3ba65",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4384.450653076172,
-    "y": 2283.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4467.517318725586,
+    "y": 2365.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "61f01ac9.4769c4",
-        "6f3f4bab.137934",
-        "b1be6cb6.4fb618"
+        "affb5b24.b6cca8",
+        "4a56bfa4.77eef",
+        "2836e90b.67e1be"
       ]
     ]
   },
   {
-    "id": "61f01ac9.4769c4",
+    "id": "affb5b24.b6cca8",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4599.450653076172,
-    "y": 2245.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4682.517318725586,
+    "y": 2327.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6f3f4bab.137934",
+    "id": "4a56bfa4.77eef",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4596.450653076172,
-    "y": 2284.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4679.517318725586,
+    "y": 2366.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2692e306.96b09c"
+        "963f6cd5.b5f28"
       ]
     ]
   },
   {
-    "id": "b1be6cb6.4fb618",
+    "id": "2836e90b.67e1be",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4551.950653076172,
-    "y": 2326.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4635.017318725586,
+    "y": 2408.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "50016039.86678",
+    "id": "2cd6b3b7.1e0b44",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4645.33349609375,
-    "y": 1962.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4728.400161743164,
+    "y": 2044.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "19550590.021992"
+        "af33acb2.7cd3c"
       ]
     ]
   },
   {
-    "id": "e8d406ab.082b08",
+    "id": "80389683.dd0d1",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4247.33349609375,
-    "y": 1958.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4330.400161743164,
+    "y": 2040.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6de4be31.1810b"
+        "6ef2734a.a2ab44"
       ]
     ]
   },
   {
-    "id": "6de4be31.1810b",
+    "id": "6ef2734a.a2ab44",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4442.33349609375,
-    "y": 1958.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4525.400161743164,
+    "y": 2040.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "50016039.86678",
-        "cba34b2.471f9b8"
+        "2cd6b3b7.1e0b44",
+        "a9acfdfb.534e9"
       ]
     ]
   },
   {
-    "id": "cba34b2.471f9b8",
+    "id": "a9acfdfb.534e9",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4647.33349609375,
-    "y": 2035.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4730.400161743164,
+    "y": 2117.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "af92238d.b3b23"
+        "3ae5ea54.6e54a6"
       ]
     ]
   },
   {
-    "id": "2692e306.96b09c",
+    "id": "963f6cd5.b5f28",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4776.950653076172,
-    "y": 2283.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4860.017318725586,
+    "y": 2365.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b1246264.28f0f"
+        "e92c023f.140be8"
       ]
     ]
   },
   {
-    "id": "b1246264.28f0f",
+    "id": "e92c023f.140be8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4934.950653076172,
-    "y": 2283.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 5018.017318725586,
+    "y": 2365.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fd4ac373.f8f388"
+        "b67ecfac.fb906"
       ]
     ]
   },
   {
-    "id": "fd4ac373.f8f388",
+    "id": "b67ecfac.fb906",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5141.950653076172,
-    "y": 2283.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 5225.017318725586,
+    "y": 2365.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "19550590.021992",
+    "id": "af33acb2.7cd3c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4822.33349609375,
-    "y": 1954.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4905.400161743164,
+    "y": 2036.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f2beac88.eedd2",
-        "e37f582f.5a4c9"
+        "21a9bcb5.4aa85c",
+        "c4167bd6.551f58"
       ]
     ]
   },
   {
-    "id": "e37f582f.5a4c9",
+    "id": "c4167bd6.551f58",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5030.33349609375,
-    "y": 1961.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5113.400161743164,
+    "y": 2043.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6a3803eb.9852cc",
-        "9a9acadd.82809",
-        "a1039497.bae268"
+        "8ae061a9.0d8d7",
+        "7fc92de3.a78f3c",
+        "220302ba.be0f7e"
       ]
     ]
   },
   {
-    "id": "af92238d.b3b23",
+    "id": "3ae5ea54.6e54a6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4824.33349609375,
-    "y": 2027.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4907.400161743164,
+    "y": 2109.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "99f85b9c.2a8238"
+        "256fff1.5dd26"
       ]
     ]
   },
   {
-    "id": "f2beac88.eedd2",
+    "id": "21a9bcb5.4aa85c",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainC id",
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5060.33349609375,
-    "y": 1909.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5143.400161743164,
+    "y": 1991.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "99f85b9c.2a8238",
+    "id": "256fff1.5dd26",
     "type": "set",
     "name": "set domainC ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5059.33349609375,
-    "y": 2151.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5142.400161743164,
+    "y": 2233.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6a3803eb.9852cc",
+    "id": "8ae061a9.0d8d7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5240.33349609375,
-    "y": 1952.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5323.400161743164,
+    "y": 2034.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f25a9292.d1fb4"
+        "9c166c79.f96aa8"
       ]
     ]
   },
   {
-    "id": "9a9acadd.82809",
+    "id": "7fc92de3.a78f3c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5232.33349609375,
-    "y": 2007.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5315.400161743164,
+    "y": 2089.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7db8b6f1.adecb8"
+        "f289682c.7a8f28"
       ]
     ]
   },
   {
-    "id": "a1039497.bae268",
+    "id": "220302ba.be0f7e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5237.33349609375,
-    "y": 2064.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5320.400161743164,
+    "y": 2146.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e3bf692a.f4e238"
+        "700667b1.628978"
       ]
     ]
   },
   {
-    "id": "e3bf692a.f4e238",
+    "id": "700667b1.628978",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5389.33349609375,
-    "y": 2065.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5472.400161743164,
+    "y": 2147.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7db8b6f1.adecb8",
+    "id": "f289682c.7a8f28",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5400.33349609375,
-    "y": 2010.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5483.400161743164,
+    "y": 2092.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f25a9292.d1fb4",
+    "id": "9c166c79.f96aa8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5384.7158203125,
-    "y": 1949.6557922363281,
-    "z": "4138d8f7.da252",
+    "x": 5467.782485961914,
+    "y": 2031.9415435791016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fbf54d7c.8184a"
+        "cc2fb272.8011c"
       ]
     ]
   },
   {
-    "id": "fbf54d7c.8184a",
+    "id": "cc2fb272.8011c",
     "type": "set",
     "name": "set controller domainC data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5599.33349609375,
-    "y": 1946.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5682.400161743164,
+    "y": 2028.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c067ce8c.82bd2",
+    "id": "6be3a1db.a02ba8",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 5628.83349609375,
-    "y": 2068.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 5711.900161743164,
+    "y": 2151.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "858f96c1.79cbc",
+    "id": "c91e3a5e.c6511",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5600.9501953125,
-    "y": 2117.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5684.016860961914,
+    "y": 2200.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8c0e0f7f.469198"
+        "8269b8aa.68a3b"
       ]
     ]
   },
   {
-    "id": "8c0e0f7f.469198",
+    "id": "8269b8aa.68a3b",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5791.9501953125,
-    "y": 2121.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5875.016860961914,
+    "y": 2204.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a3faa53c.d04c58"
+        "8a849c85.456228"
       ]
     ]
   },
   {
-    "id": "a3faa53c.d04c58",
+    "id": "8a849c85.456228",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5918.9501953125,
-    "y": 2120.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 6002.016860961914,
+    "y": 2203.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "53f62ca7.7b47cc",
-        "582e0a2f.97b604"
+        "5d5d757b.d8e52c",
+        "a560a2f0.7f8828"
       ]
     ]
   },
   {
-    "id": "582e0a2f.97b604",
+    "id": "a560a2f0.7f8828",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6140.9501953125,
-    "y": 2009.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 6224.016860961914,
+    "y": 2092.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "53f62ca7.7b47cc",
+    "id": "5d5d757b.d8e52c",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6136.83349609375,
-    "y": 2068.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6219.900161743164,
+    "y": 2151.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "142e04ee.e3d34b",
-        "257ca4bf.8f052c"
+        "51d8510d.dcc058",
+        "79e7df30.7f8138"
       ]
     ]
   },
   {
-    "id": "142e04ee.e3d34b",
+    "id": "51d8510d.dcc058",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6346.83349609375,
-    "y": 2045.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6429.900161743164,
+    "y": 2128.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9407e67d.da2418"
+        "b3aa8483.9bdec"
       ]
     ]
   },
   {
-    "id": "9407e67d.da2418",
+    "id": "b3aa8483.9bdec",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6472.83349609375,
-    "y": 2045.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6555.900161743164,
+    "y": 2128.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cd746c7.fc5cf1"
+        "50564c45.182124"
       ]
     ]
   },
   {
-    "id": "f87ebbbb.7e40d",
+    "id": "eaeffe9b.6e1578",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6477.83349609375,
-    "y": 2094.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6560.900161743164,
+    "y": 2177.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "88ec87d6.84288",
-        "29cb92cc.e394be",
-        "74fc1523.42a1e4",
-        "f8b2efa2.8dbc38"
+        "5ed2f363.68208c",
+        "ad95a077.a4baa8",
+        "283ec58.ad1d4ba",
+        "ccdfc934.795ad8"
       ]
     ]
   },
   {
-    "id": "257ca4bf.8f052c",
+    "id": "79e7df30.7f8138",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6351.83349609375,
-    "y": 2094.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6434.900161743164,
+    "y": 2177.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f87ebbbb.7e40d"
+        "eaeffe9b.6e1578"
       ]
     ]
   },
   {
-    "id": "cd746c7.fc5cf1",
+    "id": "50564c45.182124",
     "type": "save",
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6800.83349609375,
-    "y": 2042.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6883.900161743164,
+    "y": 2125.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "88ec87d6.84288",
+    "id": "5ed2f363.68208c",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainC",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6753.83349609375,
-    "y": 2133.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6836.900161743164,
+    "y": 2216.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "29cb92cc.e394be",
+    "id": "ad95a077.a4baa8",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6701.83349609375,
-    "y": 2175.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6784.900161743164,
+    "y": 2258.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "74fc1523.42a1e4",
+    "id": "283ec58.ad1d4ba",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6830.83349609375,
-    "y": 2217.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6913.900161743164,
+    "y": 2300.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "fdca37c0.7ca06",
+    "id": "192e2e3d.32bda2",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6716.83349609375,
-    "y": 2090.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6799.900161743164,
+    "y": 2173.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f8b2efa2.8dbc38",
+    "id": "ccdfc934.795ad8",
     "type": "save",
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6808.83349609375,
-    "y": 2265.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6891.900161743164,
+    "y": 2348.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1b0442b9.4b628d",
+    "id": "162cf27b.802c36",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6372.83349609375,
-    "y": 2762.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6455.900161743164,
+    "y": 2844.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "12529b57.e28025"
+        "b694c10f.97993"
       ]
     ]
   },
   {
-    "id": "12529b57.e28025",
+    "id": "b694c10f.97993",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6564.83349609375,
-    "y": 2757.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6647.900161743164,
+    "y": 2839.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "78bbff94.82c65"
+        "5f9a1d2b.927d2c"
       ]
     ]
   },
   {
-    "id": "78bbff94.82c65",
+    "id": "5f9a1d2b.927d2c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6693.83349609375,
-    "y": 2757.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6776.900161743164,
+    "y": 2839.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c9dee4ca.bc2dc"
+        "2368c13a.48b366"
       ]
     ]
   },
   {
-    "id": "c9dee4ca.bc2dc",
+    "id": "2368c13a.48b366",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 7025.83349609375,
-    "y": 2755.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 7108.900161743164,
+    "y": 2837.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "c1546bd.e66d418",
+    "id": "5a5c80f6.6318b8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5957.83349609375,
-    "y": 2974.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6040.900161743164,
+    "y": 3056.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "13b9a3fa.0e3ae4"
+        "c941a0b5.409658"
       ]
     ]
   },
   {
-    "id": "13b9a3fa.0e3ae4",
+    "id": "c941a0b5.409658",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6137.83349609375,
-    "y": 2973.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6220.900161743164,
+    "y": 3055.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e57b12b2.74ef18"
+        "e3672c28.52e2c"
       ]
     ]
   },
   {
-    "id": "e57b12b2.74ef18",
+    "id": "e3672c28.52e2c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6266.83349609375,
-    "y": 2973.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6349.900161743164,
+    "y": 3055.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c79e7977.2b3cc8"
+        "78510894.01d168"
       ]
     ]
   },
   {
-    "id": "c79e7977.2b3cc8",
+    "id": "78510894.01d168",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6484.716796875,
-    "y": 2972.449951171875,
-    "z": "4138d8f7.da252",
+    "x": 6567.783462524414,
+    "y": 3054.7357025146484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "76ccfb33.2c6e3c"
+        "7f59bec0.83cea8"
       ]
     ]
   },
   {
-    "id": "76ccfb33.2c6e3c",
+    "id": "7f59bec0.83cea8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6699.716796875,
-    "y": 2972.449951171875,
-    "z": "4138d8f7.da252",
+    "x": 6782.783462524414,
+    "y": 3054.7357025146484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f287a7b9.c4a8b"
+        "bd133df9.897ce8"
       ]
     ]
   },
   {
-    "id": "f287a7b9.c4a8b",
+    "id": "bd133df9.897ce8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6831.716796875,
-    "y": 2972.449951171875,
-    "z": "4138d8f7.da252",
+    "x": 6914.783462524414,
+    "y": 3054.7357025146484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3f3acb0.03380b6"
+        "5e2761fa.54e448"
       ]
     ]
   },
   {
-    "id": "3f3acb0.03380b6",
+    "id": "5e2761fa.54e448",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 7195.83349609375,
-    "y": 2971.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 7278.900161743164,
+    "y": 3053.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "3c12d321.f6ab2c",
+    "id": "9f73e0e4.5bd9a8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4928.33251953125,
-    "y": 2622.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5011.399185180664,
+    "y": 2704.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "700dbefa.a5007"
+        "3e0d324f.39029e"
       ]
     ]
   },
   {
-    "id": "700dbefa.a5007",
+    "id": "3e0d324f.39029e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5108.33251953125,
-    "y": 2621.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5191.399185180664,
+    "y": 2703.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c3579242.e478c8"
+        "2acf977a.ab8578"
       ]
     ]
   },
   {
-    "id": "c3579242.e478c8",
+    "id": "2acf977a.ab8578",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5237.33251953125,
-    "y": 2621.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5320.399185180664,
+    "y": 2703.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "69f846d5.9ccd18"
+        "94be4455.78db28"
       ]
     ]
   },
   {
-    "id": "cdd1f45b.46fb58",
+    "id": "83e5c66f.42223",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4973.33251953125,
-    "y": 2680.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5056.399185180664,
+    "y": 2762.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "69f846d5.9ccd18",
+    "id": "94be4455.78db28",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5003.33251953125,
-    "y": 2713.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5086.399185180664,
+    "y": 2795.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "622ffdb0.75cb54",
-        "c593ae10.f47a3",
-        "24e47d1.d702d82"
+        "e215df2d.d0af58",
+        "4a2bacef.6efd64",
+        "5a609856.e771c"
       ]
     ]
   },
   {
-    "id": "c593ae10.f47a3",
+    "id": "4a2bacef.6efd64",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5184.823486328125,
-    "y": 2690.70751953125,
-    "z": "4138d8f7.da252",
+    "x": 5267.890151977539,
+    "y": 2772.9932708740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "439fba81.48a81c"
+        "8ad6e6e5.397628"
       ]
     ]
   },
   {
-    "id": "24e47d1.d702d82",
+    "id": "5a609856.e771c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5173.33251953125,
-    "y": 2730.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5256.399185180664,
+    "y": 2812.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e58b129f.993b8"
+        "e676f166.0b9d7"
       ]
     ]
   },
   {
-    "id": "439fba81.48a81c",
+    "id": "8ad6e6e5.397628",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5344.39501953125,
-    "y": 2688.9931640625,
-    "z": "4138d8f7.da252",
+    "x": 5427.461685180664,
+    "y": 2771.2789154052734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e58b129f.993b8",
+    "id": "e676f166.0b9d7",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5334.33251953125,
-    "y": 2731.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5417.399185180664,
+    "y": 2813.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "622ffdb0.75cb54",
+    "id": "e215df2d.d0af58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5178.33251953125,
-    "y": 2767.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5261.399185180664,
+    "y": 2849.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ea27280d.d02bf8"
+        "c842a7cf.827af"
       ]
     ]
   },
   {
-    "id": "ea27280d.d02bf8",
+    "id": "c842a7cf.827af",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5336.33251953125,
-    "y": 2775.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5419.399185180664,
+    "y": 2857.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5d2e8885.4f468",
-        "6cb98496.dc88f4"
+        "c480afef.6388b8",
+        "1261035b.27b08d"
       ]
     ]
   },
   {
-    "id": "5d2e8885.4f468",
+    "id": "c480afef.6388b8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5497.33251953125,
-    "y": 2707.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5580.399185180664,
+    "y": 2789.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6cb98496.dc88f4",
+    "id": "1261035b.27b08d",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5539.33251953125,
-    "y": 2779.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5622.399185180664,
+    "y": 2861.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d39256ff.c99e4",
+    "id": "37f3e792.01b98",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5015.33251953125,
-    "y": 2980.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5098.399185180664,
+    "y": 3062.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9b669929.a8064"
+        "f8a6bae7.e43428"
       ]
     ]
   },
   {
-    "id": "9b669929.a8064",
+    "id": "f8a6bae7.e43428",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5195.33251953125,
-    "y": 2979.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5278.399185180664,
+    "y": 3061.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "479be729.dc0248"
+        "ebf9b17f.54212"
       ]
     ]
   },
   {
-    "id": "479be729.dc0248",
+    "id": "ebf9b17f.54212",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5324.33251953125,
-    "y": 2979.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5407.399185180664,
+    "y": 3061.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "96ab8e09.feb69"
+        "7632b9a7.046188"
       ]
     ]
   },
   {
-    "id": "89e60282.d93268",
+    "id": "a3e62ac2.613cb8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5060.33251953125,
-    "y": 3038.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5143.399185180664,
+    "y": 3120.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "96ab8e09.feb69",
+    "id": "7632b9a7.046188",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5090.33251953125,
-    "y": 3071.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5173.399185180664,
+    "y": 3153.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d8822576.b3585",
-        "75b8d325.77424c",
-        "c70dc607.d25bf8"
+        "aa9ebc0c.15b74",
+        "34556fac.9550b8",
+        "8f78cb97.869598"
       ]
     ]
   },
   {
-    "id": "75b8d325.77424c",
+    "id": "34556fac.9550b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5271.823486328125,
-    "y": 3048.70751953125,
-    "z": "4138d8f7.da252",
+    "x": 5354.890151977539,
+    "y": 3130.9932708740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1c3be14a.a5638f"
+        "81becde2.b2238"
       ]
     ]
   },
   {
-    "id": "c70dc607.d25bf8",
+    "id": "8f78cb97.869598",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5260.33251953125,
-    "y": 3088.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5343.399185180664,
+    "y": 3170.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "57a20811.9713c"
+        "1e2ed61a.69a74a"
       ]
     ]
   },
   {
-    "id": "1c3be14a.a5638f",
+    "id": "81becde2.b2238",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5431.39501953125,
-    "y": 3046.9931640625,
-    "z": "4138d8f7.da252",
+    "x": 5514.461685180664,
+    "y": 3129.2789154052734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "57a20811.9713c",
+    "id": "1e2ed61a.69a74a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5421.33251953125,
-    "y": 3089.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5504.399185180664,
+    "y": 3171.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d8822576.b3585",
+    "id": "aa9ebc0c.15b74",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5265.33251953125,
-    "y": 3125.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5348.399185180664,
+    "y": 3207.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "89319d00.a640d8"
+        "a5e9d80e.798b58"
       ]
     ]
   },
   {
-    "id": "89319d00.a640d8",
+    "id": "a5e9d80e.798b58",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5423.33251953125,
-    "y": 3133.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5506.399185180664,
+    "y": 3215.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f52ef279.5e2fa8",
-        "ebb57be1.fff538"
+        "f6d35763.a75968",
+        "4c3e3376.aec354"
       ]
     ]
   },
   {
-    "id": "f52ef279.5e2fa8",
+    "id": "f6d35763.a75968",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5584.33251953125,
-    "y": 3065.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5667.399185180664,
+    "y": 3147.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ebb57be1.fff538",
+    "id": "4c3e3376.aec354",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5626.33251953125,
-    "y": 3137.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5709.399185180664,
+    "y": 3219.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "b27458da.77b73",
+    "id": "54f08fa.71777f",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3497,
-    "y": 4562.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3580.066665649414,
+    "y": 4644.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b7009e9a.816708"
+        "f59f8a4e.ee5228"
       ]
     ]
   },
   {
-    "id": "b7009e9a.816708",
+    "id": "f59f8a4e.ee5228",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3677,
-    "y": 4561.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3760.066665649414,
+    "y": 4643.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "75b6f667.ff2f48"
+        "6dfc836d.44e47c"
       ]
     ]
   },
   {
-    "id": "75b6f667.ff2f48",
+    "id": "6dfc836d.44e47c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3806,
-    "y": 4561.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3889.066665649414,
+    "y": 4643.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e0e9d687.026568"
+        "84addd88.4602"
       ]
     ]
   },
   {
-    "id": "93bf9820.efc6f",
+    "id": "8e14b0c3.7931e8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3542,
-    "y": 4620.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3625.066665649414,
+    "y": 4702.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e0e9d687.026568",
+    "id": "84addd88.4602",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3572,
-    "y": 4653.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3655.066665649414,
+    "y": 4735.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6dcb758c.68fb4c",
-        "79d68d78.6f5a44",
-        "5d2b0296.8c0914"
+        "15dd9d01.198e13",
+        "99598358.2ea178",
+        "d0193baa.0b0ba8"
       ]
     ]
   },
   {
-    "id": "79d68d78.6f5a44",
+    "id": "99598358.2ea178",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3753.490966796875,
-    "y": 4630.70751953125,
-    "z": "4138d8f7.da252",
+    "x": 3836.557632446289,
+    "y": 4712.993270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "283870b5.b39d78"
+        "4987dd19.729c2c"
       ]
     ]
   },
   {
-    "id": "5d2b0296.8c0914",
+    "id": "d0193baa.0b0ba8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3742,
-    "y": 4670.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3825.066665649414,
+    "y": 4752.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "307bdbbc.e5590c"
+        "4de60967.145d88"
       ]
     ]
   },
   {
-    "id": "283870b5.b39d78",
+    "id": "4987dd19.729c2c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3913.0625,
-    "y": 4628.9931640625,
-    "z": "4138d8f7.da252",
+    "x": 3996.129165649414,
+    "y": 4711.278915405273,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "307bdbbc.e5590c",
+    "id": "4de60967.145d88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3903,
-    "y": 4671.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3986.066665649414,
+    "y": 4753.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6dcb758c.68fb4c",
+    "id": "15dd9d01.198e13",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3747,
-    "y": 4707.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3830.066665649414,
+    "y": 4789.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "22012b3c.a0e674"
+        "7135b7da.689598"
       ]
     ]
   },
   {
-    "id": "22012b3c.a0e674",
+    "id": "7135b7da.689598",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3905,
-    "y": 4715.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3988.066665649414,
+    "y": 4797.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7783af35.773e7",
-        "e7eec98c.ca59"
+        "db75607b.34ec4",
+        "368002b6.6c78de"
       ]
     ]
   },
   {
-    "id": "7783af35.773e7",
+    "id": "db75607b.34ec4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4066,
-    "y": 4647.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4149.066665649414,
+    "y": 4729.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e7eec98c.ca59",
+    "id": "368002b6.6c78de",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4108,
-    "y": 4719.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4191.066665649414,
+    "y": 4801.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "e87132f3.ee29c",
+    "id": "9630090a.96156",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4188.6669921875,
-    "y": 5517.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4271.733657836914,
+    "y": 5599.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cb7342b9.a9c168",
+    "id": "b727caf7.37ccd",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4343.6669921875,
-    "y": 5558.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4426.733657836914,
+    "y": 5640.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "7a7c44d8.30aa44",
+    "id": "9d76b5ce.608a08",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4159.6669921875,
-    "y": 5616.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4242.733657836914,
+    "y": 5698.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8bec5884.15258",
-        "bb24a1ac.622598"
+        "6c688e63.a06ce",
+        "a407cbc4.6c0c8"
       ]
     ]
   },
   {
-    "id": "8bec5884.15258",
+    "id": "6c688e63.a06ce",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4395.6669921875,
-    "y": 5600.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4478.733657836914,
+    "y": 5682.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6d098a3a.3afd8c"
+        "65c46de7.6d4354"
       ]
     ]
   },
   {
-    "id": "bb24a1ac.622598",
+    "id": "a407cbc4.6c0c8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4394.6669921875,
-    "y": 5648.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4477.733657836914,
+    "y": 5730.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "6d098a3a.3afd8c",
+    "id": "65c46de7.6d4354",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4539.6669921875,
-    "y": 5602.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4622.733657836914,
+    "y": 5684.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "de9129b3.62ee98",
-        "95ed5b5c.afa778",
-        "140ab45c.08ae54"
+        "a13d8ec4.2f4c18",
+        "3e4d3365.1256fc",
+        "d2dac5fa.54c798"
       ]
     ]
   },
   {
-    "id": "de9129b3.62ee98",
+    "id": "a13d8ec4.2f4c18",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 4951.667236328125,
-    "y": 5737.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5034.733901977539,
+    "y": 5819.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "95ed5b5c.afa778",
+    "id": "3e4d3365.1256fc",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5072.667236328125,
-    "y": 5784.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5155.733901977539,
+    "y": 5866.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "bc8a01e6.d0596",
+    "id": "37767c8a.d0935c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4955.551025390625,
-    "y": 5828.0166015625,
-    "z": "4138d8f7.da252",
+    "x": 5038.617691040039,
+    "y": 5910.302352905273,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "140ab45c.08ae54",
+    "id": "d2dac5fa.54c798",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954.334228515625,
-    "y": 5869.216796875,
-    "z": "4138d8f7.da252",
+    "x": 5037.400894165039,
+    "y": 5951.502548217773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4e2e6b5c.090cf4",
+    "id": "d0ed0f43.9ac178",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4815,
-    "y": 6123.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4898.066665649414,
+    "y": 6205.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8afd899a.01e88",
+    "id": "b5179b.b5811868",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4981,
-    "y": 6162.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5064.066665649414,
+    "y": 6244.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "8c1f115c.700108",
+    "id": "8a0b9185.29b548",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4820,
-    "y": 6212.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4903.066665649414,
+    "y": 6294.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "53961644.a48598",
-        "58a624c5.6a1504"
+        "bb485e07.c51f48",
+        "f5c035ca.78263"
       ]
     ]
   },
   {
-    "id": "53961644.a48598",
+    "id": "bb485e07.c51f48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5053,
-    "y": 6206.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5136.066665649414,
+    "y": 6288.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1edcc228.5234b6"
+        "3bbd1b25.f0fda4"
       ]
     ]
   },
   {
-    "id": "58a624c5.6a1504",
+    "id": "f5c035ca.78263",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5054,
-    "y": 6256.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5137.066665649414,
+    "y": 6338.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1edcc228.5234b6",
+    "id": "3bbd1b25.f0fda4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5200,
-    "y": 6214.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5283.066665649414,
+    "y": 6296.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a2cd952f.42f1c8",
-        "75bd12d0.4fb564",
-        "ddd98790.fa90d"
+        "e99c4f39.622098",
+        "424cf9d2.7701e8",
+        "2a6230e2.ffd498"
       ]
     ]
   },
   {
-    "id": "a2cd952f.42f1c8",
+    "id": "e99c4f39.622098",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5447,
-    "y": 6202.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5530.066665649414,
+    "y": 6284.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "75bd12d0.4fb564",
+    "id": "424cf9d2.7701e8",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5568,
-    "y": 6249.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5651.066665649414,
+    "y": 6331.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "6c605ae5.2dde2c",
+    "id": "b810129e.2691f8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5450.8837890625,
-    "y": 6293.0166015625,
-    "z": "4138d8f7.da252",
+    "x": 5533.950454711914,
+    "y": 6375.302352905273,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ddd98790.fa90d",
+    "id": "2a6230e2.ffd498",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5449.6669921875,
-    "y": 6334.216796875,
-    "z": "4138d8f7.da252",
+    "x": 5532.733657836914,
+    "y": 6416.502548217773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "e4c8e98f.2e48b8",
+    "id": "a198d826.7242b",
     "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": 3577,
-    "y": 6107.56689453125,
-    "z": "4138d8f7.da252",
+    "x": 3660.066665649414,
+    "y": 6189.852645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e06fc8.b063184",
+    "id": "c717d5f4.4fddc8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2914.25,
-    "y": 6105.81689453125,
-    "z": "4138d8f7.da252",
+    "x": 2997.316665649414,
+    "y": 6188.102645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5aaa3311.116ad4",
-        "5f201884.9bf1b"
+        "420e4506.143cfc",
+        "beb3687c.2f0758"
       ]
     ]
   },
   {
-    "id": "5aaa3311.116ad4",
+    "id": "420e4506.143cfc",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3105.25,
-    "y": 6109.81689453125,
-    "z": "4138d8f7.da252",
+    "x": 3188.316665649414,
+    "y": 6192.102645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "42b72649.a2611"
+        "75f23708.93f968"
       ]
     ]
   },
   {
-    "id": "42b72649.a2611",
+    "id": "75f23708.93f968",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3232.25,
-    "y": 6108.81689453125,
-    "z": "4138d8f7.da252",
+    "x": 3315.316665649414,
+    "y": 6191.102645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e4c8e98f.2e48b8"
+        "a198d826.7242b"
       ]
     ]
   },
   {
-    "id": "5f201884.9bf1b",
+    "id": "beb3687c.2f0758",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3101.25,
-    "y": 6179.81689453125,
-    "z": "4138d8f7.da252",
+    "x": 3184.316665649414,
+    "y": 6262.102645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1e510c07.00530c"
+        "befff12f.84551"
       ]
     ]
   },
   {
-    "id": "382dddaf.06eaa2",
+    "id": "41f38680.b5ae6",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3650.75,
-    "y": 6178.900390625,
-    "z": "4138d8f7.da252",
+    "x": 3733.816665649414,
+    "y": 6261.186141967773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e510c07.00530c",
+    "id": "befff12f.84551",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3234.75,
-    "y": 6181.900390625,
-    "z": "4138d8f7.da252",
+    "x": 3317.816665649414,
+    "y": 6264.186141967773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "382dddaf.06eaa2"
+        "41f38680.b5ae6"
       ]
     ]
   }
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
index efad7883..dc093640 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "58e34c1c.fa2ef4",
+        "id": "55da1918.a645e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 169,
-        "y": 87,
-        "z": "740154b1.db9c44",
+        "x": 271.566650390625,
+        "y": 122.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "7debdd32.eca72c"
+                "1bc5ef1e.555379"
             ]
         ]
     },
     {
-        "id": "7debdd32.eca72c",
+        "id": "1bc5ef1e.555379",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,3805 +22,3805 @@
         "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": 316,
-        "y": 662.0000152587891,
-        "z": "740154b1.db9c44",
+        "x": 418.566650390625,
+        "y": 697.5666809082031,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "17937dc9.2355da"
+                "72a47d96.f0464c"
             ]
         ]
     },
     {
-        "id": "17937dc9.2355da",
+        "id": "72a47d96.f0464c",
         "type": "method",
         "name": "tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<method rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 380.0001220703125,
-        "y": 755,
-        "z": "740154b1.db9c44",
+        "x": 482.5667724609375,
+        "y": 790.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "3e6ce739.eeb648"
+                "34c3e8c4.75c3c8"
             ]
         ]
     },
     {
-        "id": "d05eda9f.63c82",
+        "id": "c7e5fdd1.51b5a",
         "type": "execute",
         "name": "execute RestApiCallNode getPath from OOF",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\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": 425.9730682373047,
-        "y": 273.996000289917,
-        "z": "740154b1.db9c44",
+        "x": 528.5397186279297,
+        "y": 309.56266593933105,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "d4681312.af0c78",
-                "83728f7.d5447f"
+                "d6e108d2.5fc108",
+                "c846370c.449d6"
             ]
         ]
     },
     {
-        "id": "d4681312.af0c78",
+        "id": "d6e108d2.5fc108",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 665.9732093811035,
-        "y": 297.99596977233887,
-        "z": "740154b1.db9c44",
+        "x": 768.5398597717285,
+        "y": 333.56263542175293,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "b7d4d2f2.ad66"
+                "33dac520.fd9612"
             ]
         ]
     },
     {
-        "id": "54760f3b.4160e8",
+        "id": "1749300b.377e9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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 OOF api\" />\n",
         "comments": "",
-        "x": 835.9731292724609,
-        "y": 237.99606132507324,
-        "z": "740154b1.db9c44",
+        "x": 938.5397796630859,
+        "y": 273.5627269744873,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "83728f7.d5447f",
+        "id": "c846370c.449d6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 664.9729957580566,
-        "y": 246.99606037139893,
-        "z": "740154b1.db9c44",
+        "x": 767.5396461486816,
+        "y": 282.562726020813,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "54760f3b.4160e8"
+                "1749300b.377e9"
             ]
         ]
     },
     {
-        "id": "2a1c3926.ccf68e",
+        "id": "aabf6007.38015",
         "type": "comment",
         "name": "OTN tunnel path computation",
         "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",
         "comments": "",
-        "x": 397.47686767578125,
-        "y": 230,
-        "z": "740154b1.db9c44",
+        "x": 500.04351806640625,
+        "y": 265.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "b642d1e9.ee8bf8",
+        "id": "66a1cd55.f26304",
         "type": "for",
         "name": "for vidx..otn-oof.solutions_length[]",
         "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 853.972900390625,
-        "y": 723.2457275390625,
-        "z": "740154b1.db9c44",
+        "x": 956.53955078125,
+        "y": 758.8123931884766,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "782120ce.0449f"
+                "34bde7e7.01eac8"
             ]
         ]
     },
     {
-        "id": "1e8a6121.3ebf8f",
+        "id": "b912adec.34afe",
         "type": "comment",
         "name": "Loop through OTN links",
         "info": "",
         "comments": "",
-        "x": 937.4732055664062,
-        "y": 802.74609375,
-        "z": "740154b1.db9c44",
+        "x": 1040.0398559570312,
+        "y": 838.3127593994141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "782120ce.0449f",
+        "id": "34bde7e7.01eac8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 958.5001220703125,
-        "y": 914.2864990234375,
-        "z": "740154b1.db9c44",
+        "x": 1061.0667724609375,
+        "y": 949.8531646728516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c89cb66b.dc0d2",
-                "154e7688.b29339",
-                "4f1a8be1.b37344",
-                "2cdce288.c30c46",
-                "287cbb25.9abd94"
+                "7334f4ec.cbdcec",
+                "a07b9575.5fb718",
+                "78ed6398.2c281c",
+                "a81521ff.85b448",
+                "f61d745e.897b28"
             ]
         ]
     },
     {
-        "id": "c89cb66b.dc0d2",
+        "id": "7334f4ec.cbdcec",
         "type": "set",
         "name": "set otn-oof.link-name and etc.",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].original_link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].src_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].dst_node`' />",
         "comments": "",
-        "x": 1205.0001220703125,
-        "y": 807.2864990234375,
-        "z": "740154b1.db9c44",
+        "x": 1307.5667724609375,
+        "y": 842.8531646728516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "b7d4d2f2.ad66",
+        "id": "33dac520.fd9612",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 811.0002555847168,
-        "y": 295.741455078125,
-        "z": "740154b1.db9c44",
+        "x": 913.5669059753418,
+        "y": 331.30812072753906,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e6ce739.eeb648",
+        "id": "34c3e8c4.75c3c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 620.9688835144043,
-        "y": 681.7416372299194,
-        "z": "740154b1.db9c44",
+        "x": 723.5355339050293,
+        "y": 717.3083028793335,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "b642d1e9.ee8bf8",
-                "d800f8fa.097b28",
-                "3eb232d2.31d3ce",
-                "7d4b4351.930cbc"
+                "66a1cd55.f26304",
+                "10360917.9b8077",
+                "9aea1ae3.78f458",
+                "949527f9.d2ae5"
             ]
         ]
     },
     {
-        "id": "b9e5ba4.2ed1f48",
+        "id": "4f42b7a6.ec3be8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2372.4998779296875,
-        "y": 1240,
-        "z": "740154b1.db9c44",
+        "x": 2475.0665283203125,
+        "y": 1275.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "287cbb25.9abd94",
+        "id": "f61d745e.897b28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1171.5001220703125,
-        "y": 996,
-        "z": "740154b1.db9c44",
+        "x": 1274.0667724609375,
+        "y": 1031.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "55e25897.4f1fe8",
-                "1809a4d6.ba2673"
+                "edcf8a17.3c1388",
+                "21981b27.dc0a0c"
             ]
         ]
     },
     {
-        "id": "ed734d7c.04c2f8",
+        "id": "d41411aa.2fbe08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2696.9998779296875,
-        "y": 731,
-        "z": "740154b1.db9c44",
+        "x": 2799.5665283203125,
+        "y": 766.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "d4861d1.90a2f6"
+                "1b874a77.cb23d6"
             ]
         ]
     },
     {
-        "id": "551be9a2.28b98",
+        "id": "ec1c7dff.7ed9c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2730,
-        "y": 789,
-        "z": "740154b1.db9c44",
+        "x": 2832.566650390625,
+        "y": 824.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "bc9d63b9.95524"
+                "6a0b9275.25af84"
             ]
         ]
     },
     {
-        "id": "22092f51.833d9",
+        "id": "593d14b8.4d3af4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2733,
-        "y": 841,
-        "z": "740154b1.db9c44",
+        "x": 2835.566650390625,
+        "y": 876.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "757b2f22.e7f98"
+                "7711b881.aaafb8"
             ]
         ]
     },
     {
-        "id": "bc9d63b9.95524",
+        "id": "6a0b9275.25af84",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2915,
-        "y": 793,
-        "z": "740154b1.db9c44",
+        "x": 3017.566650390625,
+        "y": 828.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "757b2f22.e7f98",
+        "id": "7711b881.aaafb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2903,
-        "y": 844,
-        "z": "740154b1.db9c44",
+        "x": 3005.566650390625,
+        "y": 879.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "1391535e.6e46bd",
+        "id": "c385141d.3475d8",
         "type": "set",
         "name": "set domain A node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4033.4998779296875,
-        "y": 646,
-        "z": "740154b1.db9c44",
+        "x": 4136.0665283203125,
+        "y": 681.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "2d1abf42.aacfc8",
+        "id": "8b31beaa.98c0f8",
         "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.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4041.4998779296875,
-        "y": 698,
-        "z": "740154b1.db9c44",
+        "x": 4144.0665283203125,
+        "y": 733.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "492ab725.abc14"
+                "d767d020.bad1e"
             ]
         ]
     },
     {
-        "id": "492ab725.abc14",
+        "id": "d767d020.bad1e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4247.9998779296875,
-        "y": 676,
-        "z": "740154b1.db9c44",
+        "x": 4350.5665283203125,
+        "y": 711.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "ca00a5f6.d5b71"
+                "d5ff040e.d2f8b"
             ]
         ]
     },
     {
-        "id": "fe7961d1.c0f4e",
+        "id": "a5ba7946.9385e8",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3585.6683349609375,
-        "y": 724.4815063476562,
-        "z": "740154b1.db9c44",
+        "x": 3688.2349853515625,
+        "y": 760.0481719970703,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "59e37319.f4bec4"
+                "325b8414.0a0f7c"
             ]
         ]
     },
     {
-        "id": "20453efe.bca822",
+        "id": "dd30a478.a8f71",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3048.3826904296875,
-        "y": 726.6597290039062,
-        "z": "740154b1.db9c44",
+        "x": 3150.9493408203125,
+        "y": 762.2263946533203,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "f844ac94.89e1e"
+                "d8739293.dd811"
             ]
         ]
     },
     {
-        "id": "f844ac94.89e1e",
+        "id": "d8739293.dd811",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3300.3826904296875,
-        "y": 723.6597290039062,
-        "z": "740154b1.db9c44",
+        "x": 3402.9493408203125,
+        "y": 759.2263946533203,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "fe7961d1.c0f4e"
+                "a5ba7946.9385e8"
             ]
         ]
     },
     {
-        "id": "59e37319.f4bec4",
+        "id": "325b8414.0a0f7c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3812.4998779296875,
-        "y": 713,
-        "z": "740154b1.db9c44",
+        "x": 3915.0665283203125,
+        "y": 748.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "1391535e.6e46bd",
-                "2d1abf42.aacfc8",
-                "d4f97b75.15b158",
-                "12165a81.403f85",
-                "103b5c34.d77a7c"
+                "c385141d.3475d8",
+                "8b31beaa.98c0f8",
+                "9cb3666f.fe6288",
+                "cc03f562.203da8",
+                "b538ddb.0ac7ba"
             ]
         ]
     },
     {
-        "id": "55e25897.4f1fe8",
+        "id": "edcf8a17.3c1388",
         "type": "get-resource",
         "name": "get-resource dst tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2453.5,
-        "y": 1136,
-        "z": "740154b1.db9c44",
+        "x": 2556.066650390625,
+        "y": 1171.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "49c1a7b6.6f99c",
-                "2b24743b.25895c",
-                "c683e8fa.16a0b"
+                "966cd988.263208",
+                "2f0ba896.1bff08",
+                "5512ef83.d0409"
             ]
         ]
     },
     {
-        "id": "49c1a7b6.6f99c",
+        "id": "966cd988.263208",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2675.9998779296875,
-        "y": 1278,
-        "z": "740154b1.db9c44",
+        "x": 2778.5665283203125,
+        "y": 1313.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "ed45880a.b1c94"
+                "d01135ac.6fb8"
             ]
         ]
     },
     {
-        "id": "2b24743b.25895c",
+        "id": "2f0ba896.1bff08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2659.9998779296875,
-        "y": 1329,
-        "z": "740154b1.db9c44",
+        "x": 2762.5665283203125,
+        "y": 1364.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "37c7eeb2.67c862"
+                "dc2d6a40.545b28"
             ]
         ]
     },
     {
-        "id": "c683e8fa.16a0b",
+        "id": "5512ef83.d0409",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2662.9998779296875,
-        "y": 1381,
-        "z": "740154b1.db9c44",
+        "x": 2765.5665283203125,
+        "y": 1416.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "78affe58.b6f08"
+                "f1dc200a.0079b8"
             ]
         ]
     },
     {
-        "id": "78affe58.b6f08",
+        "id": "f1dc200a.0079b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2832.9998779296875,
-        "y": 1384,
-        "z": "740154b1.db9c44",
+        "x": 2935.5665283203125,
+        "y": 1419.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "37c7eeb2.67c862",
+        "id": "dc2d6a40.545b28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2844.9998779296875,
-        "y": 1333,
-        "z": "740154b1.db9c44",
+        "x": 2947.5665283203125,
+        "y": 1368.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "141988e8.b25ef7",
+        "id": "eda7d352.9073e",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3032.3826904296875,
-        "y": 1288.6597290039062,
-        "z": "740154b1.db9c44",
+        "x": 3134.9493408203125,
+        "y": 1324.2263946533203,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "a370922d.726108"
+                "3127fdbc.48d8ba"
             ]
         ]
     },
     {
-        "id": "a370922d.726108",
+        "id": "3127fdbc.48d8ba",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3275.3826904296875,
-        "y": 1287.6597290039062,
-        "z": "740154b1.db9c44",
+        "x": 3377.9493408203125,
+        "y": 1323.2263946533203,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "e6beb03b.67e37"
+                "1629bb11.b51185"
             ]
         ]
     },
     {
-        "id": "61d27ccc.5b8de4",
+        "id": "2bfd4c7b.7322cc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5041.4998779296875,
-        "y": 1089,
-        "z": "740154b1.db9c44",
+        "x": 5144.0665283203125,
+        "y": 1124.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "6cde7588.a972a4",
-                "46f2ef05.7f74e8",
-                "36e1e931.d36586"
+                "83a9dba4.165df8",
+                "213b5817.319d6",
+                "eacf08ed.9b6908"
             ]
         ]
     },
     {
-        "id": "e6beb03b.67e37",
+        "id": "1629bb11.b51185",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3531.6683349609375,
-        "y": 1287.4815063476562,
-        "z": "740154b1.db9c44",
+        "x": 3634.2349853515625,
+        "y": 1323.0481719970703,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "412a94c.16241ec"
+                "1697afc2.a7d658"
             ]
         ]
     },
     {
-        "id": "df39947.2e32868",
+        "id": "a4a4d9de.8b1e5",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4828.4998779296875,
-        "y": 1088,
-        "z": "740154b1.db9c44",
+        "x": 4931.0665283203125,
+        "y": 1123.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "61d27ccc.5b8de4"
+                "2bfd4c7b.7322cc"
             ]
         ]
     },
     {
-        "id": "412a94c.16241ec",
+        "id": "1697afc2.a7d658",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3831.4998779296875,
-        "y": 1285,
-        "z": "740154b1.db9c44",
+        "x": 3934.0665283203125,
+        "y": 1320.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "58c1eb2d.4365dc",
-                "eafee68f.21777",
-                "3baf326d.94389e",
-                "7894f836.65f328",
-                "9b949993.6af3e"
+                "64565dd0.7224d4",
+                "60e5c227.98dd4c",
+                "aa1de99e.ebfdb8",
+                "1e08769.d5ce909",
+                "19848a3.1ad4df6"
             ]
         ]
     },
     {
-        "id": "58c1eb2d.4365dc",
+        "id": "64565dd0.7224d4",
         "type": "set",
         "name": "set domain B node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4073.4998779296875,
-        "y": 1239,
-        "z": "740154b1.db9c44",
+        "x": 4176.0665283203125,
+        "y": 1274.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "eafee68f.21777",
+        "id": "60e5c227.98dd4c",
         "type": "get-resource",
         "name": "get-resource dst 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.domain-B.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4063.4998779296875,
-        "y": 1290,
-        "z": "740154b1.db9c44",
+        "x": 4166.0665283203125,
+        "y": 1325.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "135e1de8.ac41a2"
+                "1423a8aa.1e5bbf"
             ]
         ]
     },
     {
-        "id": "135e1de8.ac41a2",
+        "id": "1423a8aa.1e5bbf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4250.9998779296875,
-        "y": 1288,
-        "z": "740154b1.db9c44",
+        "x": 4353.5665283203125,
+        "y": 1323.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "e5e86a3d.a35168"
+                "fe536508.3d42a8"
             ]
         ]
     },
     {
-        "id": "6cde7588.a972a4",
+        "id": "83a9dba4.165df8",
         "type": "set",
         "name": "set domain B network-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5311.4998779296875,
-        "y": 1065,
-        "z": "740154b1.db9c44",
+        "x": 5414.0665283203125,
+        "y": 1100.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "46f2ef05.7f74e8",
+        "id": "213b5817.319d6",
         "type": "get-resource",
         "name": "get-resource dst network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5321.4998779296875,
-        "y": 1111,
-        "z": "740154b1.db9c44",
+        "x": 5424.0665283203125,
+        "y": 1146.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "95269d9e.8f1978"
+                "93d4670b.467a7"
             ]
         ]
     },
     {
-        "id": "95269d9e.8f1978",
+        "id": "93d4670b.467a7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5536.9998779296875,
-        "y": 1102,
-        "z": "740154b1.db9c44",
+        "x": 5639.5665283203125,
+        "y": 1137.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "d0d56062.e96878"
+                "3c1a17a3.7c5698"
             ]
         ]
     },
     {
-        "id": "d0d56062.e96878",
+        "id": "3c1a17a3.7c5698",
         "type": "set",
         "name": "set domain B network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 5791.4998779296875,
-        "y": 1108,
-        "z": "740154b1.db9c44",
+        "x": 5894.0665283203125,
+        "y": 1143.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "d4861d1.90a2f6",
+        "id": "1b874a77.cb23d6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2830.9998779296875,
-        "y": 727,
-        "z": "740154b1.db9c44",
+        "x": 2933.5665283203125,
+        "y": 762.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "20453efe.bca822"
+                "dd30a478.a8f71"
             ]
         ]
     },
     {
-        "id": "ed45880a.b1c94",
+        "id": "d01135ac.6fb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2821.9998779296875,
-        "y": 1269,
-        "z": "740154b1.db9c44",
+        "x": 2924.5665283203125,
+        "y": 1304.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "141988e8.b25ef7"
+                "eda7d352.9073e"
             ]
         ]
     },
     {
-        "id": "ca00a5f6.d5b71",
+        "id": "d5ff040e.d2f8b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4422.9998779296875,
-        "y": 672,
-        "z": "740154b1.db9c44",
+        "x": 4525.5665283203125,
+        "y": 707.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "4c98d169.bddc"
+                "7a85cdc9.21de74"
             ]
         ]
     },
     {
-        "id": "e5e86a3d.a35168",
+        "id": "fe536508.3d42a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4439.9998779296875,
-        "y": 1277,
-        "z": "740154b1.db9c44",
+        "x": 4542.5665283203125,
+        "y": 1312.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "b92cc089.036dc8"
+                "7f789c56.73a404"
             ]
         ]
     },
     {
-        "id": "1809a4d6.ba2673",
+        "id": "21981b27.dc0a0c",
         "type": "get-resource",
         "name": "get-resource src tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2499.5,
-        "y": 770,
-        "z": "740154b1.db9c44",
+        "x": 2602.066650390625,
+        "y": 805.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "ed734d7c.04c2f8",
-                "551be9a2.28b98",
-                "22092f51.833d9"
+                "d41411aa.2fbe08",
+                "ec1c7dff.7ed9c",
+                "593d14b8.4d3af4"
             ]
         ]
     },
     {
-        "id": "d4f97b75.15b158",
+        "id": "9cb3666f.fe6288",
         "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-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3902.9998779296875,
-        "y": 516,
-        "z": "740154b1.db9c44",
+        "x": 4005.5665283203125,
+        "y": 551.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "27b2efea.3f735",
-                "abdc030.e780f",
-                "d67670c0.149af8"
+                "2d596f92.386da",
+                "b8bb35c7.68022",
+                "50dbd465.907d94"
             ]
         ]
     },
     {
-        "id": "27b2efea.3f735",
+        "id": "2d596f92.386da",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4098.5,
-        "y": 468,
-        "z": "740154b1.db9c44",
+        "x": 4201.066650390625,
+        "y": 503.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "67bcf691.cce0a8"
+                "7b9cb223.733344"
             ]
         ]
     },
     {
-        "id": "abdc030.e780f",
+        "id": "b8bb35c7.68022",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4090.5,
-        "y": 523,
-        "z": "740154b1.db9c44",
+        "x": 4193.066650390625,
+        "y": 558.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "f2e24f2.12fadb"
+                "def9d226.6d2cf8"
             ]
         ]
     },
     {
-        "id": "d67670c0.149af8",
+        "id": "50dbd465.907d94",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4095.5,
-        "y": 580,
-        "z": "740154b1.db9c44",
+        "x": 4198.066650390625,
+        "y": 615.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c3d2abbd.c8f708"
+                "7c7e6039.479ca8"
             ]
         ]
     },
     {
-        "id": "c3d2abbd.c8f708",
+        "id": "7c7e6039.479ca8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4247.5,
-        "y": 581,
-        "z": "740154b1.db9c44",
+        "x": 4350.066650390625,
+        "y": 616.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "f2e24f2.12fadb",
+        "id": "def9d226.6d2cf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4258.5,
-        "y": 526,
-        "z": "740154b1.db9c44",
+        "x": 4361.066650390625,
+        "y": 561.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "67bcf691.cce0a8",
+        "id": "7b9cb223.733344",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4242.88232421875,
-        "y": 465.6556701660156,
-        "z": "740154b1.db9c44",
+        "x": 4345.448974609375,
+        "y": 501.2223358154297,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "304592d5.537a8e",
-                "2af9eb5e.d3c17c"
+                "726f1c43.81de24",
+                "6baa44bf.896aa4"
             ]
         ]
     },
     {
-        "id": "304592d5.537a8e",
+        "id": "726f1c43.81de24",
         "type": "set",
         "name": "set domain A node-id and tpn",
         "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4467.9998779296875,
-        "y": 421,
-        "z": "740154b1.db9c44",
+        "x": 4570.5665283203125,
+        "y": 456.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "12165a81.403f85",
+        "id": "cc03f562.203da8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3989.9998779296875,
-        "y": 763,
-        "z": "740154b1.db9c44",
+        "x": 4092.5665283203125,
+        "y": 798.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "4c98d169.bddc",
+        "id": "7a85cdc9.21de74",
         "type": "set",
         "name": "set domain A tunnel tp ip",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n",
         "comments": "",
-        "x": 4683.9998779296875,
-        "y": 669,
-        "z": "740154b1.db9c44",
+        "x": 4786.5665283203125,
+        "y": 704.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "7894f836.65f328",
+        "id": "1e08769.d5ce909",
         "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-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3899.9998779296875,
-        "y": 1119,
-        "z": "740154b1.db9c44",
+        "x": 4002.5665283203125,
+        "y": 1154.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "54998b27.2003cc",
-                "d1cd027c.1f10b8",
-                "75ff3dee.3bf8bc"
+                "1a2b49d5.b5a17e",
+                "7bc68f65.9bf008",
+                "aa0e1591.186978"
             ]
         ]
     },
     {
-        "id": "75ff3dee.3bf8bc",
+        "id": "aa0e1591.186978",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4095.5,
-        "y": 1071,
-        "z": "740154b1.db9c44",
+        "x": 4198.066650390625,
+        "y": 1106.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c056b35b.56583"
+                "d1b079c.9297d08"
             ]
         ]
     },
     {
-        "id": "d1cd027c.1f10b8",
+        "id": "7bc68f65.9bf008",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4087.5,
-        "y": 1126,
-        "z": "740154b1.db9c44",
+        "x": 4190.066650390625,
+        "y": 1161.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "560adcd5.77c02c"
+                "2daddcb3.194964"
             ]
         ]
     },
     {
-        "id": "54998b27.2003cc",
+        "id": "1a2b49d5.b5a17e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4092.5,
-        "y": 1183,
-        "z": "740154b1.db9c44",
+        "x": 4195.066650390625,
+        "y": 1218.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "3b1e11f8.04c5b6"
+                "ec80c220.eda94"
             ]
         ]
     },
     {
-        "id": "c056b35b.56583",
+        "id": "d1b079c.9297d08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4239.88232421875,
-        "y": 1068.6556701660156,
-        "z": "740154b1.db9c44",
+        "x": 4342.448974609375,
+        "y": 1104.2223358154297,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "7ca2f810.f9ca5",
-                "5d0e55ed.7c2c54"
+                "86d91eb8.1d4188",
+                "ccc8b0e3.aa30a"
             ]
         ]
     },
     {
-        "id": "560adcd5.77c02c",
+        "id": "2daddcb3.194964",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4255.5,
-        "y": 1129,
-        "z": "740154b1.db9c44",
+        "x": 4358.066650390625,
+        "y": 1164.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "3b1e11f8.04c5b6",
+        "id": "ec80c220.eda94",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4244.5,
-        "y": 1184,
-        "z": "740154b1.db9c44",
+        "x": 4347.066650390625,
+        "y": 1219.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "7ca2f810.f9ca5",
+        "id": "86d91eb8.1d4188",
         "type": "set",
         "name": "set domain B node-id and tpn",
         "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4448.9998779296875,
-        "y": 1036,
-        "z": "740154b1.db9c44",
+        "x": 4551.5665283203125,
+        "y": 1071.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "3baf326d.94389e",
+        "id": "aa1de99e.ebfdb8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4018.9998779296875,
-        "y": 1331,
-        "z": "740154b1.db9c44",
+        "x": 4121.5665283203125,
+        "y": 1366.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "b92cc089.036dc8",
+        "id": "7f789c56.73a404",
         "type": "set",
         "name": "set domain B tunnel tp id",
         "xml": "<set>\n<parameter name='domain-B.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4672.9998779296875,
-        "y": 1276,
-        "z": "740154b1.db9c44",
+        "x": 4775.5665283203125,
+        "y": 1311.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "c8548322.1dce7",
+        "id": "4af47e1.d24b48",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4824.9998779296875,
-        "y": 484,
-        "z": "740154b1.db9c44",
+        "x": 4927.5665283203125,
+        "y": 519.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "49aa1e98.21619"
+                "4f3cf505.2fca3c"
             ]
         ]
     },
     {
-        "id": "49aa1e98.21619",
+        "id": "4f3cf505.2fca3c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5001.9998779296875,
-        "y": 476,
-        "z": "740154b1.db9c44",
+        "x": 5104.5665283203125,
+        "y": 511.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "13542cdd.43dda3",
-                "909a99fa.787ae8",
-                "44fc9502.8d863c"
+                "3a45344a.82c99c",
+                "6a555c5c.0d6d94",
+                "bc9971ad.98e16"
             ]
         ]
     },
     {
-        "id": "13542cdd.43dda3",
+        "id": "3a45344a.82c99c",
         "type": "set",
         "name": "set domain A network-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5216.9998779296875,
-        "y": 457,
-        "z": "740154b1.db9c44",
+        "x": 5319.5665283203125,
+        "y": 492.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "909a99fa.787ae8",
+        "id": "6a555c5c.0d6d94",
         "type": "get-resource",
         "name": "get-resource src network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5233.9998779296875,
-        "y": 521,
-        "z": "740154b1.db9c44",
+        "x": 5336.5665283203125,
+        "y": 556.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "30bbae6f.18af4a"
+                "12908a50.109196"
             ]
         ]
     },
     {
-        "id": "30bbae6f.18af4a",
+        "id": "12908a50.109196",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5457.4998779296875,
-        "y": 522,
-        "z": "740154b1.db9c44",
+        "x": 5560.0665283203125,
+        "y": 557.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "a367788a.bb68e"
+                "d7f6c969.bf14a8"
             ]
         ]
     },
     {
-        "id": "a367788a.bb68e",
+        "id": "d7f6c969.bf14a8",
         "type": "set",
         "name": "set domain A network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n\n\n",
         "comments": "",
-        "x": 5721.9998779296875,
-        "y": 511,
-        "z": "740154b1.db9c44",
+        "x": 5824.5665283203125,
+        "y": 546.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "2af9eb5e.d3c17c",
+        "id": "6baa44bf.896aa4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4426.9998779296875,
-        "y": 480,
-        "z": "740154b1.db9c44",
+        "x": 4529.5665283203125,
+        "y": 515.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "df80ec0f.2a1388"
+                "c5bce932.312ae8"
             ]
         ]
     },
     {
-        "id": "df80ec0f.2a1388",
+        "id": "c5bce932.312ae8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4621.9998779296875,
-        "y": 480,
-        "z": "740154b1.db9c44",
+        "x": 4724.5665283203125,
+        "y": 515.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c8548322.1dce7"
+                "4af47e1.d24b48"
             ]
         ]
     },
     {
-        "id": "44fc9502.8d863c",
+        "id": "bc9971ad.98e16",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5160.9998779296875,
-        "y": 574,
-        "z": "740154b1.db9c44",
+        "x": 5263.5665283203125,
+        "y": 609.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "5d0e55ed.7c2c54",
+        "id": "ccc8b0e3.aa30a",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4427.9998779296875,
-        "y": 1087,
-        "z": "740154b1.db9c44",
+        "x": 4530.5665283203125,
+        "y": 1122.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "97742823.a37f08"
+                "2505107d.3aa54"
             ]
         ]
     },
     {
-        "id": "97742823.a37f08",
+        "id": "2505107d.3aa54",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4622.9998779296875,
-        "y": 1087,
-        "z": "740154b1.db9c44",
+        "x": 4725.5665283203125,
+        "y": 1122.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "df39947.2e32868"
+                "a4a4d9de.8b1e5"
             ]
         ]
     },
     {
-        "id": "36e1e931.d36586",
+        "id": "eacf08ed.9b6908",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5246.9998779296875,
-        "y": 1167,
-        "z": "740154b1.db9c44",
+        "x": 5349.5665283203125,
+        "y": 1202.566665649414,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "103b5c34.d77a7c",
+        "id": "b538ddb.0ac7ba",
         "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.src-tp`'/>-->\n<parameter name=\"original_string\" value='`$tmp.aai.src-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3930.9998779296875,
-        "y": 310,
-        "z": "740154b1.db9c44",
+        "x": 4033.5665283203125,
+        "y": 345.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "b3bf59d4.5b493",
-                "21c8620c.a1786e"
+                "e05ff3f0.c79818",
+                "bfafe917.9e0828"
             ]
         ]
     },
     {
-        "id": "21c8620c.a1786e",
+        "id": "bfafe917.9e0828",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4151.9998779296875,
-        "y": 278,
-        "z": "740154b1.db9c44",
+        "x": 4254.5665283203125,
+        "y": 313.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "ac6a8696.ec08c8"
+                "984c7f99.dba1f8"
             ]
         ]
     },
     {
-        "id": "b3bf59d4.5b493",
+        "id": "e05ff3f0.c79818",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4151.9998779296875,
-        "y": 325,
-        "z": "740154b1.db9c44",
+        "x": 4254.5665283203125,
+        "y": 360.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "53c1b9f8.feb02"
+                "ab85b68d.00fab8"
             ]
         ]
     },
     {
-        "id": "ac6a8696.ec08c8",
+        "id": "984c7f99.dba1f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4316.9998779296875,
-        "y": 275,
-        "z": "740154b1.db9c44",
+        "x": 4419.5665283203125,
+        "y": 310.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c3a92ffe.308538"
+                "1167b845.d3eb88"
             ]
         ]
     },
     {
-        "id": "c3a92ffe.308538",
+        "id": "1167b845.d3eb88",
         "type": "set",
         "name": "set domain-A.ltpId",
         "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4498.9998779296875,
-        "y": 279,
-        "z": "740154b1.db9c44",
+        "x": 4601.5665283203125,
+        "y": 314.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "53c1b9f8.feb02",
+        "id": "ab85b68d.00fab8",
         "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": 4318.9998779296875,
-        "y": 325,
-        "z": "740154b1.db9c44",
+        "x": 4421.5665283203125,
+        "y": 360.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "9b949993.6af3e",
+        "id": "19848a3.1ad4df6",
         "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.dst-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3938.9998779296875,
-        "y": 934,
-        "z": "740154b1.db9c44",
+        "x": 4041.5665283203125,
+        "y": 969.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "63b15b9d.d0246c",
-                "438781d9.fa013"
+                "bcadf20f.09707",
+                "f49b197.760f268"
             ]
         ]
     },
     {
-        "id": "438781d9.fa013",
+        "id": "f49b197.760f268",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4159.9998779296875,
-        "y": 902,
-        "z": "740154b1.db9c44",
+        "x": 4262.5665283203125,
+        "y": 937.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "7c480aff.2bda14"
+                "7a4a14cb.2c7cc4"
             ]
         ]
     },
     {
-        "id": "63b15b9d.d0246c",
+        "id": "bcadf20f.09707",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4159.9998779296875,
-        "y": 949,
-        "z": "740154b1.db9c44",
+        "x": 4262.5665283203125,
+        "y": 984.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "6669851b.858ebc"
+                "f8a2353e.30053"
             ]
         ]
     },
     {
-        "id": "7c480aff.2bda14",
+        "id": "7a4a14cb.2c7cc4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4324.9998779296875,
-        "y": 899,
-        "z": "740154b1.db9c44",
+        "x": 4427.5665283203125,
+        "y": 934.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "6535be11.5e3bd"
+                "c7ad40e1.18d2e8"
             ]
         ]
     },
     {
-        "id": "6535be11.5e3bd",
+        "id": "c7ad40e1.18d2e8",
         "type": "set",
         "name": "set domain-B.ltpId",
         "xml": "<set>\n<parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4520.9998779296875,
-        "y": 896,
-        "z": "740154b1.db9c44",
+        "x": 4623.5665283203125,
+        "y": 931.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "6669851b.858ebc",
+        "id": "f8a2353e.30053",
         "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": 4326.9998779296875,
-        "y": 949,
-        "z": "740154b1.db9c44",
+        "x": 4429.5665283203125,
+        "y": 984.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "154e7688.b29339",
+        "id": "a07b9575.5fb718",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<!--<parameter name='tmp.aai.cross-link' value='' />-->\n<parameter name='tmp.aai.cross-link.' value='' />\n<!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->",
         "comments": "",
-        "x": 1196,
-        "y": 736,
-        "z": "740154b1.db9c44",
+        "x": 1298.566650390625,
+        "y": 771.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "5f2860ab.d20368",
+        "id": "49f4a3da.f830dc",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-A.ltpId is not used anymore",
         "comments": "",
-        "x": 4541.9998779296875,
-        "y": 255,
-        "z": "740154b1.db9c44",
+        "x": 4644.5665283203125,
+        "y": 290.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "839b6b92.78af58",
+        "id": "6c8ca0d9.ae8db8",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-B.ltpId is not used anymore",
         "comments": "",
-        "x": 4563.9998779296875,
-        "y": 868,
-        "z": "740154b1.db9c44",
+        "x": 4666.5665283203125,
+        "y": 903.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "d800f8fa.097b28",
+        "id": "10360917.9b8077",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<!--<parameter name='`tmp.otninfo_length`' value='0' />-->\n<parameter name='`tmp.otninfoProtect.`' value='' />",
         "comments": "",
-        "x": 837,
-        "y": 664,
-        "z": "740154b1.db9c44",
+        "x": 939.566650390625,
+        "y": 699.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "9d59de38.f2a96",
+        "id": "197c2e5d.40b5c2",
         "type": "comment",
         "name": "May not be necessary",
         "info": "",
         "comments": "",
-        "x": 848,
-        "y": 617,
-        "z": "740154b1.db9c44",
+        "x": 950.566650390625,
+        "y": 652.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "3eb232d2.31d3ce",
+        "id": "9aea1ae3.78f458",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 828,
-        "y": 414,
-        "z": "740154b1.db9c44",
+        "x": 930.566650390625,
+        "y": 449.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "ef757a3b.136af8",
-                "170891d6.65d54e",
-                "69ba386e.9da968",
-                "2e082ac1.a1ccfe",
-                "a74fb526.bc5db",
-                "4af9732c.943804",
-                "45b96535.5a3dac",
-                "1033844e.1fe0b4",
-                "644a4209.4c190c",
-                "752e7b91.ad42a4",
-                "7d6aaca7.ab1b4c",
-                "441d97dd.ea8d",
-                "75c12230.00ef3c"
+                "8d20e71f.73ff3",
+                "a7d23344.01d178",
+                "bdabda22.abbcf",
+                "2d95a78.15b9dd8",
+                "fa4a5e3a.f8a4e8",
+                "1732667e.72f262",
+                "2d0258cc.74942",
+                "52bfffd9.b2be3",
+                "9fbe4c7e.064f2",
+                "272b0d1.5ea4172",
+                "c5b8562e.825c2",
+                "f2fd0ea2.f13608",
+                "5207916.8d843f"
             ]
         ]
     },
     {
-        "id": "874f6992.1d0f",
+        "id": "b34bb5ff.c918e",
         "type": "execute",
         "name": "execute PCE in ccsdk/sli/core",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePaths' >\n<parameter name=\"pnfs-pfx\" value='ccsdkTopopnfs'/>\n<parameter name=\"links-pfx\" value=\"ccsdkTopologicalLinks\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"false\"/>\n<!--<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"dst-node\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"src-node\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.pce-dst-node`\"/>\n<parameter name=\"dst-node-backup\" value=\"`$tmp.pce-dst-node-backup`\"/>\n<parameter name=\"require-backuppath\" value=\"`$hasSecondary`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1650,
-        "y": 661,
-        "z": "740154b1.db9c44",
+        "x": 1752.566650390625,
+        "y": 696.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "9cd26432.6ca2e",
-                "d020471b.87351",
-                "d9ad3259.cc415"
+                "d8269b88.a628f",
+                "bd71ad8b.09afd",
+                "ab86e983.081cb"
             ]
         ]
     },
     {
-        "id": "ef757a3b.136af8",
+        "id": "8d20e71f.73ff3",
         "type": "record",
         "name": "record tmp.pce-src and dst node and backup",
         "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<parameter name=\"field3\" value=\"`$tmp.pce-dst-node-backup`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1124,
-        "y": 447,
-        "z": "740154b1.db9c44",
+        "x": 1226.566650390625,
+        "y": 482.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "9cd26432.6ca2e",
+        "id": "d8269b88.a628f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1895,
-        "y": 693,
-        "z": "740154b1.db9c44",
+        "x": 1997.566650390625,
+        "y": 728.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "d020471b.87351",
+        "id": "bd71ad8b.09afd",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1902,
-        "y": 735,
-        "z": "740154b1.db9c44",
+        "x": 2004.566650390625,
+        "y": 770.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9ad3259.cc415",
+        "id": "ab86e983.081cb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1897,
-        "y": 656,
-        "z": "740154b1.db9c44",
+        "x": 1999.566650390625,
+        "y": 691.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "170891d6.65d54e",
+        "id": "a7d23344.01d178",
         "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": 1045,
-        "y": 319,
-        "z": "740154b1.db9c44",
+        "x": 1147.566650390625,
+        "y": 354.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "69ba386e.9da968",
+        "id": "bdabda22.abbcf",
         "type": "set",
         "name": "set tmp.pce-dst-node",
         "xml": "<set>\n<!--<parameter name='$tmp.pce-dst-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.pce-dst-node' 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                                                   $otnTopoIdDst + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />",
         "comments": "",
-        "x": 1045,
-        "y": 359,
-        "z": "740154b1.db9c44",
+        "x": 1147.566650390625,
+        "y": 394.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "4f1a8be1.b37344",
+        "id": "78ed6398.2c281c",
         "type": "set",
         "name": "set src-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$otn-oof.solutions[$vidx].src_pinterface`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$otn-oof.solutions[$vidx].src_node`\" />\n",
         "comments": "",
-        "x": 1178,
-        "y": 867,
-        "z": "740154b1.db9c44",
+        "x": 1280.566650390625,
+        "y": 902.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "2cdce288.c30c46",
+        "id": "a81521ff.85b448",
         "type": "set",
         "name": "set dst-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$otn-oof.solutions[$vidx].dst_pinterface`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$otn-oof.solutions[$vidx].dst_node`\" />\n\n\n",
         "comments": "",
-        "x": 1179,
-        "y": 917,
-        "z": "740154b1.db9c44",
+        "x": 1281.566650390625,
+        "y": 952.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "2e082ac1.a1ccfe",
+        "id": "2d95a78.15b9dd8",
         "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/v21/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1102,
-        "y": 43,
-        "z": "740154b1.db9c44",
+        "x": 1204.566650390625,
+        "y": 78.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "8367b97c.7cba2",
-                "c705fa11.095f6",
-                "3e5ba73a.cfbd2"
+                "85160fe1.7646a8",
+                "5cf07174.f97d5",
+                "95dd25f4.16dd98"
             ]
         ]
     },
     {
-        "id": "c705fa11.095f6",
+        "id": "5cf07174.f97d5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1335,
-        "y": 67,
-        "z": "740154b1.db9c44",
+        "x": 1437.566650390625,
+        "y": 102.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e5ba73a.cfbd2",
+        "id": "95dd25f4.16dd98",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1349,
-        "y": 107,
-        "z": "740154b1.db9c44",
+        "x": 1451.566650390625,
+        "y": 142.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "8367b97c.7cba2",
+        "id": "85160fe1.7646a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1338,
-        "y": 26,
-        "z": "740154b1.db9c44",
+        "x": 1440.566650390625,
+        "y": 61.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "a74fb526.bc5db",
+        "id": "fa4a5e3a.f8a4e8",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 1094,
-        "y": 89,
-        "z": "740154b1.db9c44",
+        "x": 1196.566650390625,
+        "y": 124.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "e64f1c2c.75e2a8"
+                "a46c1b09.222d88"
             ]
         ]
     },
     {
-        "id": "e64f1c2c.75e2a8",
+        "id": "a46c1b09.222d88",
         "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": 1415,
-        "y": 165,
-        "z": "740154b1.db9c44",
+        "x": 1517.566650390625,
+        "y": 200.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "6f7c355b.5a1c94",
-                "49d801ae.f158f"
+                "d01d8d32.ec5d38",
+                "81f4ca42.44c8"
             ]
         ]
     },
     {
-        "id": "6f7c355b.5a1c94",
+        "id": "d01d8d32.ec5d38",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1639,
-        "y": 227,
-        "z": "740154b1.db9c44",
+        "x": 1741.566650390625,
+        "y": 262.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "14708434.e61bac"
+                "87874c93.14d4c8"
             ]
         ]
     },
     {
-        "id": "14708434.e61bac",
+        "id": "87874c93.14d4c8",
         "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": 1852,
-        "y": 227,
-        "z": "740154b1.db9c44",
+        "x": 1954.566650390625,
+        "y": 262.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "4944f354.0e26f4"
+                "1f97427e.3bd1ce"
             ]
         ]
     },
     {
-        "id": "4944f354.0e26f4",
+        "id": "1f97427e.3bd1ce",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2017,
-        "y": 227,
-        "z": "740154b1.db9c44",
+        "x": 2119.566650390625,
+        "y": 262.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "3ffd16fe.ae9d82"
+                "e1187fc2.b7873"
             ]
         ]
     },
     {
-        "id": "3ffd16fe.ae9d82",
+        "id": "e1187fc2.b7873",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 2186,
-        "y": 227,
-        "z": "740154b1.db9c44",
+        "x": 2288.566650390625,
+        "y": 262.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "49d801ae.f158f",
+        "id": "81f4ca42.44c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1639,
-        "y": 280,
-        "z": "740154b1.db9c44",
+        "x": 1741.566650390625,
+        "y": 315.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "88e310ce.d70d1"
+                "c4d51181.d481d"
             ]
         ]
     },
     {
-        "id": "88e310ce.d70d1",
+        "id": "c4d51181.d481d",
         "type": "switchNode",
         "name": "switch provider-id domainB",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainB-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1827,
-        "y": 280,
-        "z": "740154b1.db9c44",
+        "x": 1929.566650390625,
+        "y": 315.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "58122a1d.8684e4",
-                "3cb3eb19.e7f8b4"
+                "1eb6a395.543214",
+                "aff2e998.39f418"
             ]
         ]
     },
     {
-        "id": "58122a1d.8684e4",
+        "id": "1eb6a395.543214",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2017,
-        "y": 280,
-        "z": "740154b1.db9c44",
+        "x": 2119.566650390625,
+        "y": 315.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "5772e567.b80a34"
+                "131fed58.61933b"
             ]
         ]
     },
     {
-        "id": "5772e567.b80a34",
+        "id": "131fed58.61933b",
         "type": "switchNode",
         "name": "switch te-topo-id",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainB-pnfName[6]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2185,
-        "y": 280,
-        "z": "740154b1.db9c44",
+        "x": 2287.566650390625,
+        "y": 315.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "2fb8eaf6.956b36"
+                "beb59651.122648"
             ]
         ]
     },
     {
-        "id": "2fb8eaf6.956b36",
+        "id": "beb59651.122648",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2341,
-        "y": 280,
-        "z": "740154b1.db9c44",
+        "x": 2443.566650390625,
+        "y": 315.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "821af63c.9d499"
+                "27e9a268.b581ce"
             ]
         ]
     },
     {
-        "id": "3d7e803.580f08",
+        "id": "fe5f3417.d45418",
         "type": "set",
         "name": "set otnTopoIdDst",
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3036,
-        "y": 184,
-        "z": "740154b1.db9c44",
+        "x": 3138.566650390625,
+        "y": 219.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "4af9732c.943804",
+        "id": "1732667e.72f262",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<!--<parameter name='`otn-oof`' value='' />-->\n<parameter name='otn-oof.' value='' />\n<!--<parameter name='`otn-oof.solutions`' value='' />-->\n<!--<parameter name='`otn-oof.solutions.`' value='' />-->\n<!--<parameter name='`otn-oof.solutions_length`' value='0' />-->",
         "comments": "",
-        "x": 1039,
-        "y": 260,
-        "z": "740154b1.db9c44",
+        "x": 1141.566650390625,
+        "y": 295.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "45b96535.5a3dac",
+        "id": "2d0258cc.74942",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
-        "x": 1048,
-        "y": 142,
-        "z": "740154b1.db9c44",
+        "x": 1150.566650390625,
+        "y": 177.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "1033844e.1fe0b4",
+        "id": "52bfffd9.b2be3",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node.' value='' />\n",
         "comments": "",
-        "x": 1046,
-        "y": 184,
-        "z": "740154b1.db9c44",
+        "x": 1148.566650390625,
+        "y": 219.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "644a4209.4c190c",
+        "id": "9fbe4c7e.064f2",
         "type": "record",
         "name": "record otn-oof.",
         "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=\"`$otn-oof.`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1035,
-        "y": 495,
-        "z": "740154b1.db9c44",
+        "x": 1137.566650390625,
+        "y": 530.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9004337.b1e7",
+        "id": "6130a3db.8f4a2c",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1057,
-        "y": 568,
-        "z": "740154b1.db9c44",
+        "x": 1159.566650390625,
+        "y": 603.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "752e7b91.ad42a4",
+        "id": "272b0d1.5ea4172",
         "type": "set",
         "name": "set filename",
         "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='filenamemm' value=\"`$tmp.pce-src-node + $tmp.pce-dst-node + $tmp.pce-dst-node-backup`\" />",
         "comments": "",
-        "x": 1031,
-        "y": 531,
-        "z": "740154b1.db9c44",
+        "x": 1133.566650390625,
+        "y": 566.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "3cb3eb19.e7f8b4",
+        "id": "aff2e998.39f418",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2007,
-        "y": 344,
-        "z": "740154b1.db9c44",
+        "x": 2109.566650390625,
+        "y": 379.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "b16334e2.e8d148"
+                "45368237.09cbd4"
             ]
         ]
     },
     {
-        "id": "b16334e2.e8d148",
+        "id": "45368237.09cbd4",
         "type": "switchNode",
         "name": "switch provider-id domainC",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainC-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2208,
-        "y": 345,
-        "z": "740154b1.db9c44",
+        "x": 2310.566650390625,
+        "y": 380.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "7d3fd43.e41d5ac"
+                "60978bb2.ce9a04"
             ]
         ]
     },
     {
-        "id": "7d3fd43.e41d5ac",
+        "id": "60978bb2.ce9a04",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2418,
-        "y": 345,
-        "z": "740154b1.db9c44",
+        "x": 2520.566650390625,
+        "y": 380.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "dccf569f.2f16c"
+                "cc22664a.751d9"
             ]
         ]
     },
     {
-        "id": "e56fd0ad.9e01a8",
+        "id": "2b3da5c.c5bcc5a",
         "type": "set",
         "name": "set otnTopoIdDstBackup",
         "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3126,
-        "y": 435.0000305175781,
-        "z": "740154b1.db9c44",
+        "x": 3228.566650390625,
+        "y": 470.5666961669922,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "7d6aaca7.ab1b4c",
+        "id": "c5b8562e.825c2",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node-backup.' value='' />\n",
         "comments": "",
-        "x": 1044,
-        "y": 222,
-        "z": "740154b1.db9c44",
+        "x": 1146.566650390625,
+        "y": 257.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "441d97dd.ea8d",
+        "id": "f2fd0ea2.f13608",
         "type": "set",
         "name": "set tmp.pce-dst-node-backup",
         "xml": "<set>\n<!--<parameter name='$tmp.pce-dst-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.pce-dst-node-backup' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $otnTopoIdDstBackup + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />",
         "comments": "",
-        "x": 1076,
-        "y": 400,
-        "z": "740154b1.db9c44",
+        "x": 1178.566650390625,
+        "y": 435.56666564941406,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "75c12230.00ef3c",
+        "id": "5207916.8d843f",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1080,
-        "y": 647,
-        "z": "740154b1.db9c44",
+        "x": 1182.566650390625,
+        "y": 682.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "bdfc5f0.5322ba",
-                "89aa82c1.c2aec8"
+                "9d24bff4.f7fc3",
+                "53b4e0bd.3986c8"
             ]
         ]
     },
     {
-        "id": "bdfc5f0.5322ba",
+        "id": "9d24bff4.f7fc3",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1271,
-        "y": 651,
-        "z": "740154b1.db9c44",
+        "x": 1373.566650390625,
+        "y": 686.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "ae417966.2eaf28"
+                "c8813a5.7f98b48"
             ]
         ]
     },
     {
-        "id": "ae417966.2eaf28",
+        "id": "c8813a5.7f98b48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1398,
-        "y": 650,
-        "z": "740154b1.db9c44",
+        "x": 1500.566650390625,
+        "y": 685.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "874f6992.1d0f"
+                "b34bb5ff.c918e"
             ]
         ]
     },
     {
-        "id": "89aa82c1.c2aec8",
+        "id": "53b4e0bd.3986c8",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1273,
-        "y": 604,
-        "z": "740154b1.db9c44",
+        "x": 1375.566650390625,
+        "y": 639.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "50eccb47.89161c"
+                "758c479c.bf4b8"
             ]
         ]
     },
     {
-        "id": "50eccb47.89161c",
+        "id": "758c479c.bf4b8",
         "type": "execute",
         "name": "execute PCE in ccsdk/sli/core",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >\n<parameter name=\"pnfs-pfx\" value='ccsdkTopopnfs'/>\n<parameter name=\"links-pfx\" value=\"ccsdkTopologicalLinks\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"false\"/>\n<!--<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"dst-node\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"src-node\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.pce-dst-node`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1647,
-        "y": 534,
-        "z": "740154b1.db9c44",
+        "x": 1749.566650390625,
+        "y": 569.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "e3a2c563.0a869",
-                "2d6f2f7c.332048",
-                "b9b4d723.6c8fd"
+                "b6552b0f.7b51e8",
+                "e27e8a21.4f0d3",
+                "b3bc4161.bbb128"
             ]
         ]
     },
     {
-        "id": "e3a2c563.0a869",
+        "id": "b6552b0f.7b51e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1892,
-        "y": 566,
-        "z": "740154b1.db9c44",
+        "x": 1994.566650390625,
+        "y": 601.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d6f2f7c.332048",
+        "id": "e27e8a21.4f0d3",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1899,
-        "y": 608,
-        "z": "740154b1.db9c44",
+        "x": 2001.566650390625,
+        "y": 643.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "b9b4d723.6c8fd",
+        "id": "b3bc4161.bbb128",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1894,
-        "y": 529,
-        "z": "740154b1.db9c44",
+        "x": 1996.566650390625,
+        "y": 564.5666656494141,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e1473f30.10032",
+        "id": "c19998ca.837848",
         "type": "for",
         "name": "for vidx..otn-oof.secondarySolutions_length[]",
         "xml": "<for index='vidx' start='0' end='`$otn-oof.secondarySolutions_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 845,
-        "y": 2065,
-        "z": "740154b1.db9c44",
+        "x": 947.566650390625,
+        "y": 2100.566665649414,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c89ad3b7.0e216"
+                "decd0bab.6330f"
             ]
         ]
     },
     {
-        "id": "c89ad3b7.0e216",
+        "id": "decd0bab.6330f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 949.5272216796875,
-        "y": 2256.040771484375,
-        "z": "740154b1.db9c44",
+        "x": 1052.0938720703125,
+        "y": 2291.607437133789,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "80fa0c9d.1054f",
-                "9a5ac465.6157d8",
-                "8065227b.cd4a2",
-                "b1aba60b.7f9e6",
-                "deccca97.268a9"
+                "81b9ae35.358fd",
+                "74f1c10d.f5627",
+                "64fb9896.7c1ac8",
+                "74b04e90.089e28",
+                "d162f07e.eec04"
             ]
         ]
     },
     {
-        "id": "80fa0c9d.1054f",
+        "id": "81b9ae35.358fd",
         "type": "set",
         "name": "set otn-oof.link-name and etc.",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.secondarySolutions[$vidx].original_link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.secondarySolutions[$vidx].src_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.secondarySolutions[$vidx].dst_node`' />",
         "comments": "",
-        "x": 1196.0272216796875,
-        "y": 2149.040771484375,
-        "z": "740154b1.db9c44",
+        "x": 1298.5938720703125,
+        "y": 2184.607437133789,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "deccca97.268a9",
+        "id": "d162f07e.eec04",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1162.5272216796875,
-        "y": 2337.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 1265.0938720703125,
+        "y": 2373.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "e3c2dcef.aae8f8",
-                "55fb0c7e.571584"
+                "9a15bd2c.c28818",
+                "85fd58d.daa8628"
             ]
         ]
     },
     {
-        "id": "9a5ac465.6157d8",
+        "id": "74f1c10d.f5627",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<!--<parameter name='tmp.aai.cross-link' value='' />-->\n<parameter name='tmp.aai.cross-link.' value='' />\n<!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->\n\n<parameter name='tmp.src-pnf-name' value='' />\n<parameter name='tmp.cross-link.' value='' />\n<parameter name='tmp.dst-pnf-name' value='' />\n<parameter name='tmp.aai.src-tp.' value='' />\n<parameter name='param-prefix-src-tp.' value='' />\n<parameter name='tmp.aai.src-pnf.' value='' />\n<parameter name='tmp.domain-A.network-id' value='' />\n<parameter name='tmp.aai.src-network-resource.' value='' />\n<parameter name='tmp.domain-A.ttp-id' value='' />\n<parameter name='tmp.aai.src-ttp.' value='' />\n\n<parameter name='tmp.aai.dst-tp.' value='' />\n<parameter name='param-prefix-dst-tp.' value='' />\n<parameter name='tmp.aai.dst-pnf.' value='' />\n<parameter name='tmp.domain-C.network-id' value='' />\n<parameter name='tmp.aai.dst-network-resource.' value='' />\n<parameter name='tmp.domain-C.ttp-id' value='' />\n<parameter name='tmp.aai.dst-ttp.' value='' />\n\n",
         "comments": "",
-        "x": 1187.027099609375,
-        "y": 2077.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 1289.59375,
+        "y": 2113.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "8065227b.cd4a2",
+        "id": "64fb9896.7c1ac8",
         "type": "set",
         "name": "set src-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$otn-oof.secondarySolutions[$vidx].src_pinterface`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$otn-oof.secondarySolutions[$vidx].src_node`\" />\n",
         "comments": "",
-        "x": 1169.027099609375,
-        "y": 2208.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 1271.59375,
+        "y": 2244.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "b1aba60b.7f9e6",
+        "id": "74b04e90.089e28",
         "type": "set",
         "name": "set dst-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$otn-oof.secondarySolutions[$vidx].dst_pinterface`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$otn-oof.secondarySolutions[$vidx].dst_node`\" />\n\n\n",
         "comments": "",
-        "x": 1170.027099609375,
-        "y": 2258.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 1272.59375,
+        "y": 2294.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "6e12f41a.3aad64",
+        "id": "46c3f571.5e6ab4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2688.0269775390625,
-        "y": 2072.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2790.5936279296875,
+        "y": 2108.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "5b6bf151.2d756"
+                "190fafd3.9d5618"
             ]
         ]
     },
     {
-        "id": "b5b16aa9.5e894",
+        "id": "1af50a9f.ba08f5",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2721.027099609375,
-        "y": 2130.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2823.59375,
+        "y": 2166.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "a9d16a27.d5676"
+                "eb6a21e7.d2544"
             ]
         ]
     },
     {
-        "id": "4a01d696.8c8118",
+        "id": "9ac3f118.22cc9",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2724.027099609375,
-        "y": 2182.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2826.59375,
+        "y": 2218.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c1a7727e.a603d8"
+                "5df935cf.d90ef4"
             ]
         ]
     },
     {
-        "id": "a9d16a27.d5676",
+        "id": "eb6a21e7.d2544",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2906.027099609375,
-        "y": 2134.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 3008.59375,
+        "y": 2170.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "c1a7727e.a603d8",
+        "id": "5df935cf.d90ef4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2894.027099609375,
-        "y": 2185.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2996.59375,
+        "y": 2221.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "40a1b2c.bbb3c4c",
+        "id": "76d93361.427b24",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3039.4097900390625,
-        "y": 2068.4140014648438,
-        "z": "740154b1.db9c44",
+        "x": 3141.9764404296875,
+        "y": 2103.980667114258,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "64ce1fe.fe36ee"
+                "3f5fbc68.02a224"
             ]
         ]
     },
     {
-        "id": "64ce1fe.fe36ee",
+        "id": "3f5fbc68.02a224",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3291.4097900390625,
-        "y": 2065.4140014648438,
-        "z": "740154b1.db9c44",
+        "x": 3393.9764404296875,
+        "y": 2100.980667114258,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "7222973f.63de28"
+                "ba2b4720.d65cf"
             ]
         ]
     },
     {
-        "id": "5b6bf151.2d756",
+        "id": "190fafd3.9d5618",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2822.0269775390625,
-        "y": 2068.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2924.5936279296875,
+        "y": 2104.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "40a1b2c.bbb3c4c"
+                "76d93361.427b24"
             ]
         ]
     },
     {
-        "id": "55fb0c7e.571584",
+        "id": "85fd58d.daa8628",
         "type": "get-resource",
         "name": "get-resource src tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2490.527099609375,
-        "y": 2111.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2593.09375,
+        "y": 2147.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "6e12f41a.3aad64",
-                "b5b16aa9.5e894",
-                "4a01d696.8c8118"
+                "46c3f571.5e6ab4",
+                "1af50a9f.ba08f5",
+                "9ac3f118.22cc9"
             ]
         ]
     },
     {
-        "id": "961bb541.fa238",
+        "id": "17b12d07.01db03",
         "type": "set",
         "name": "set domain A node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4024.5269775390625,
-        "y": 1987.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4127.0936279296875,
+        "y": 2023.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "1c9ed8f.1f298a7",
+        "id": "56dc3866.a81c4",
         "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.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4032.5269775390625,
-        "y": 2039.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4135.0936279296875,
+        "y": 2075.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c8884a5e.cff248"
+                "bd3f106f.63b0f8"
             ]
         ]
     },
     {
-        "id": "c8884a5e.cff248",
+        "id": "bd3f106f.63b0f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4239.0269775390625,
-        "y": 2017.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4341.5936279296875,
+        "y": 2053.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "ca161250.2600b"
+                "e873d0c7.864da"
             ]
         ]
     },
     {
-        "id": "7222973f.63de28",
+        "id": "ba2b4720.d65cf",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3576.6954345703125,
-        "y": 2066.2357788085938,
-        "z": "740154b1.db9c44",
+        "x": 3679.2620849609375,
+        "y": 2101.802444458008,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "9a193d4a.e0dcc8"
+                "53671013.434608"
             ]
         ]
     },
     {
-        "id": "9a193d4a.e0dcc8",
+        "id": "53671013.434608",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3803.5269775390625,
-        "y": 2054.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 3906.0936279296875,
+        "y": 2090.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "961bb541.fa238",
-                "1c9ed8f.1f298a7",
-                "8d06a9c9.1b85a",
-                "63176143.c85c48",
-                "cef3ca9d.2c104"
+                "17b12d07.01db03",
+                "56dc3866.a81c4",
+                "c0980ef4.f86658",
+                "1febeafa.37d915",
+                "ab68a575.dbe428"
             ]
         ]
     },
     {
-        "id": "ca161250.2600b",
+        "id": "e873d0c7.864da",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4414.0269775390625,
-        "y": 2013.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4516.5936279296875,
+        "y": 2049.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "258887d0.26df98"
+                "42a0b5ef.0a3e6c"
             ]
         ]
     },
     {
-        "id": "8d06a9c9.1b85a",
+        "id": "c0980ef4.f86658",
         "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-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3894.0269775390625,
-        "y": 1857.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 3996.5936279296875,
+        "y": 1893.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "9a5fd1c3.7d763",
-                "e3871f94.a28688",
-                "67939630.c5f78"
+                "fabc0bd7.062ae",
+                "cfe003ed.a587d",
+                "45d38fe1.3add68"
             ]
         ]
     },
     {
-        "id": "9a5fd1c3.7d763",
+        "id": "fabc0bd7.062ae",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4089.527099609375,
-        "y": 1809.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4192.09375,
+        "y": 1845.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "7fb21e6a.21f63"
+                "c6a1c641.2a058"
             ]
         ]
     },
     {
-        "id": "e3871f94.a28688",
+        "id": "cfe003ed.a587d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4081.527099609375,
-        "y": 1864.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4184.09375,
+        "y": 1900.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "3c75373d.b0767"
+                "1b4dfe50.a881e2"
             ]
         ]
     },
     {
-        "id": "67939630.c5f78",
+        "id": "45d38fe1.3add68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4086.527099609375,
-        "y": 1921.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4189.09375,
+        "y": 1957.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "8ad73c5e.3d1f"
+                "6ffbe3ea.ec634c"
             ]
         ]
     },
     {
-        "id": "8ad73c5e.3d1f",
+        "id": "6ffbe3ea.ec634c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4238.527099609375,
-        "y": 1922.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4341.09375,
+        "y": 1958.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "3c75373d.b0767",
+        "id": "1b4dfe50.a881e2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4249.527099609375,
-        "y": 1867.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4352.09375,
+        "y": 1903.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "7fb21e6a.21f63",
+        "id": "c6a1c641.2a058",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4233.909423828125,
-        "y": 1807.4099426269531,
-        "z": "740154b1.db9c44",
+        "x": 4336.47607421875,
+        "y": 1842.9766082763672,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "a55467d3.0aaea8",
-                "87797c29.69366"
+                "59cb321.8a1954c",
+                "49c6e1ec.24535"
             ]
         ]
     },
     {
-        "id": "a55467d3.0aaea8",
+        "id": "59cb321.8a1954c",
         "type": "set",
         "name": "set domain A node-id and tpn",
         "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4459.0269775390625,
-        "y": 1762.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4561.5936279296875,
+        "y": 1798.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "63176143.c85c48",
+        "id": "1febeafa.37d915",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3981.0269775390625,
-        "y": 2104.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4083.5936279296875,
+        "y": 2140.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "87797c29.69366",
+        "id": "49c6e1ec.24535",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4418.0269775390625,
-        "y": 1821.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4520.5936279296875,
+        "y": 1857.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "58b11002.4131b"
+                "8d839c87.82ade8"
             ]
         ]
     },
     {
-        "id": "cef3ca9d.2c104",
+        "id": "ab68a575.dbe428",
         "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.src-tp`'/>-->\n<parameter name=\"original_string\" value='`$tmp.aai.src-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3922.0269775390625,
-        "y": 1651.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4024.5936279296875,
+        "y": 1687.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "51326991.7f2898",
-                "d61d1517.27825"
+                "f1409763.115658",
+                "697906a6.2f581"
             ]
         ]
     },
     {
-        "id": "d61d1517.27825",
+        "id": "697906a6.2f581",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4143.0269775390625,
-        "y": 1619.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4245.5936279296875,
+        "y": 1655.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "8ed0c03d.565928"
+                "54d6be87.274308"
             ]
         ]
     },
     {
-        "id": "51326991.7f2898",
+        "id": "f1409763.115658",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4143.0269775390625,
-        "y": 1666.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4245.5936279296875,
+        "y": 1702.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "a6e04e00.ffd96"
+                "6390534f.61c684"
             ]
         ]
     },
     {
-        "id": "8ed0c03d.565928",
+        "id": "54d6be87.274308",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4308.0269775390625,
-        "y": 1616.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4410.5936279296875,
+        "y": 1652.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "14cffe9c.903701"
+                "f9eb1fe5.bf94b8"
             ]
         ]
     },
     {
-        "id": "14cffe9c.903701",
+        "id": "f9eb1fe5.bf94b8",
         "type": "set",
         "name": "set domain-A.ltpId",
         "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4490.0269775390625,
-        "y": 1620.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4592.5936279296875,
+        "y": 1656.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "a6e04e00.ffd96",
+        "id": "6390534f.61c684",
         "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": 4310.0269775390625,
-        "y": 1666.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4412.5936279296875,
+        "y": 1702.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "cc685b27.bd32f",
+        "id": "78eb0221.5dfc84",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-A.ltpId is not used anymore",
         "comments": "",
-        "x": 4533.0269775390625,
-        "y": 1596.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4635.5936279296875,
+        "y": 1632.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "258887d0.26df98",
+        "id": "42a0b5ef.0a3e6c",
         "type": "set",
         "name": "set domain A tunnel tp ip",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />\n",
         "comments": "",
-        "x": 4675.0269775390625,
-        "y": 2010.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4777.5936279296875,
+        "y": 2046.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "7878d7b8.ad7df",
+        "id": "ba5b9e92.be837",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4816.0269775390625,
-        "y": 1825.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4918.5936279296875,
+        "y": 1861.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "346dd4d8.896974"
+                "897ba475.c5f53"
             ]
         ]
     },
     {
-        "id": "58b11002.4131b",
+        "id": "8d839c87.82ade8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4613.0269775390625,
-        "y": 1821.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4715.5936279296875,
+        "y": 1857.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "7878d7b8.ad7df"
+                "ba5b9e92.be837"
             ]
         ]
     },
     {
-        "id": "346dd4d8.896974",
+        "id": "897ba475.c5f53",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4993.0269775390625,
-        "y": 1817.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5095.5936279296875,
+        "y": 1853.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "dd0e1ad2.389f1",
-                "34802cc8.f036dc",
-                "83c1d591.e453a"
+                "bef188d5.c786d8",
+                "792f44ce.13c154",
+                "18753ca.06672c3"
             ]
         ]
     },
     {
-        "id": "dd0e1ad2.389f1",
+        "id": "bef188d5.c786d8",
         "type": "set",
         "name": "set domain A network-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5208.0269775390625,
-        "y": 1798.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5310.5936279296875,
+        "y": 1834.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "34802cc8.f036dc",
+        "id": "792f44ce.13c154",
         "type": "get-resource",
         "name": "get-resource src network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5225.0269775390625,
-        "y": 1862.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5327.5936279296875,
+        "y": 1898.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c18da62b.d46198"
+                "5b892dc0.3c8d04"
             ]
         ]
     },
     {
-        "id": "c18da62b.d46198",
+        "id": "5b892dc0.3c8d04",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5448.5269775390625,
-        "y": 1863.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5551.0936279296875,
+        "y": 1899.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "2a6e1402.9f26d4"
+                "ba2d6189.94da7"
             ]
         ]
     },
     {
-        "id": "2a6e1402.9f26d4",
+        "id": "ba2d6189.94da7",
         "type": "set",
         "name": "set domain A network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfoProtect`' value='`$vidx + 1`' />\n\n\n",
         "comments": "",
-        "x": 5713.0269775390625,
-        "y": 1852.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5815.5936279296875,
+        "y": 1888.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "83c1d591.e453a",
+        "id": "18753ca.06672c3",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5152.0269775390625,
-        "y": 1915.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5254.5936279296875,
+        "y": 1951.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "57f7d786.5549e8",
+        "id": "8130be42.c4b418",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2363.5269775390625,
-        "y": 2581.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2466.0936279296875,
+        "y": 2617.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "e3c2dcef.aae8f8",
+        "id": "9a15bd2c.c28818",
         "type": "get-resource",
         "name": "get-resource dst tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2444.527099609375,
-        "y": 2477.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2547.09375,
+        "y": 2513.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "8b9fb321.70992",
-                "205abd09.598d9a",
-                "79e9c51.a089fbc"
+                "bbfaea50.2f8978",
+                "48b1011.95ef3",
+                "f850bc1.45f5a4"
             ]
         ]
     },
     {
-        "id": "8b9fb321.70992",
+        "id": "bbfaea50.2f8978",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2667.0269775390625,
-        "y": 2619.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2769.5936279296875,
+        "y": 2655.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "6279b5de.cc4ff4"
+                "8bd3d4c4.129cd"
             ]
         ]
     },
     {
-        "id": "205abd09.598d9a",
+        "id": "48b1011.95ef3",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2651.0269775390625,
-        "y": 2670.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2753.5936279296875,
+        "y": 2706.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "46e04c65.2008ac"
+                "31d51c19.564114"
             ]
         ]
     },
     {
-        "id": "79e9c51.a089fbc",
+        "id": "f850bc1.45f5a4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2654.0269775390625,
-        "y": 2722.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2756.5936279296875,
+        "y": 2758.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "76686faa.840d7"
+                "e3e65a88.eeb708"
             ]
         ]
     },
     {
-        "id": "76686faa.840d7",
+        "id": "e3e65a88.eeb708",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2824.0269775390625,
-        "y": 2725.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2926.5936279296875,
+        "y": 2761.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "46e04c65.2008ac",
+        "id": "31d51c19.564114",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2836.0269775390625,
-        "y": 2674.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2938.5936279296875,
+        "y": 2710.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "8589fea6.82485",
+        "id": "93be1dc8.40e81",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3023.4097900390625,
-        "y": 2630.4140014648438,
-        "z": "740154b1.db9c44",
+        "x": 3125.9764404296875,
+        "y": 2665.980667114258,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "12c89e29.9e0a4a"
+                "fdc63182.4572f"
             ]
         ]
     },
     {
-        "id": "12c89e29.9e0a4a",
+        "id": "fdc63182.4572f",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3266.4097900390625,
-        "y": 2629.4140014648438,
-        "z": "740154b1.db9c44",
+        "x": 3368.9764404296875,
+        "y": 2664.980667114258,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "441cee99.bfaf"
+                "d054e714.1f47"
             ]
         ]
     },
     {
-        "id": "6279b5de.cc4ff4",
+        "id": "8bd3d4c4.129cd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2813.0269775390625,
-        "y": 2610.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 2915.5936279296875,
+        "y": 2646.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "8589fea6.82485"
+                "93be1dc8.40e81"
             ]
         ]
     },
     {
-        "id": "441cee99.bfaf",
+        "id": "d054e714.1f47",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3522.6954345703125,
-        "y": 2629.2357788085938,
-        "z": "740154b1.db9c44",
+        "x": 3625.2620849609375,
+        "y": 2664.802444458008,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "ee93bb7d.d7a6"
+                "64e60c2e.997314"
             ]
         ]
     },
     {
-        "id": "ee93bb7d.d7a6",
+        "id": "64e60c2e.997314",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3822.5269775390625,
-        "y": 2626.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 3925.0936279296875,
+        "y": 2662.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "7f181100.6e913",
-                "d5405c3b.2180e",
-                "a9d72cbf.011738",
-                "aba88a5.2928878",
-                "ce4f5014.a0532"
+                "1bae9a4e.9212ce",
+                "de2043de.3cb548",
+                "3a2030d6.3a864",
+                "5ff21da9.833f84",
+                "8657cf90.772ff"
             ]
         ]
     },
     {
-        "id": "7f181100.6e913",
+        "id": "1bae9a4e.9212ce",
         "type": "set",
         "name": "set domain C node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-C.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4064.5269775390625,
-        "y": 2580.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4167.0936279296875,
+        "y": 2616.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "d5405c3b.2180e",
+        "id": "de2043de.3cb548",
         "type": "get-resource",
         "name": "get-resource dst 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.domain-C.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4054.5269775390625,
-        "y": 2631.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4157.0936279296875,
+        "y": 2667.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "d43d5001.cef3c8"
+                "5c3476dc.51e558"
             ]
         ]
     },
     {
-        "id": "d43d5001.cef3c8",
+        "id": "5c3476dc.51e558",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4242.0269775390625,
-        "y": 2629.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4344.5936279296875,
+        "y": 2665.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "e0b1256e.3d7278"
+                "4eaafddf.a6a3f4"
             ]
         ]
     },
     {
-        "id": "e0b1256e.3d7278",
+        "id": "4eaafddf.a6a3f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4431.0269775390625,
-        "y": 2618.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4533.5936279296875,
+        "y": 2654.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "2dbd68c.e7c9e98"
+                "c29c48f8.7f86a8"
             ]
         ]
     },
     {
-        "id": "aba88a5.2928878",
+        "id": "5ff21da9.833f84",
         "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-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3891.0269775390625,
-        "y": 2460.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 3993.5936279296875,
+        "y": 2496.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "dc3d15fa.81276",
-                "84f6f122.84593",
-                "df513d92.eaab28"
+                "89d8cb14.97ad38",
+                "b75d0391.114cc8",
+                "e1054df9.4be03"
             ]
         ]
     },
     {
-        "id": "df513d92.eaab28",
+        "id": "e1054df9.4be03",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4086.527099609375,
-        "y": 2412.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4189.09375,
+        "y": 2448.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "992d2ff.35fffd"
+                "1aa1ec12.0bb82c"
             ]
         ]
     },
     {
-        "id": "84f6f122.84593",
+        "id": "b75d0391.114cc8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4078.527099609375,
-        "y": 2467.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4181.09375,
+        "y": 2503.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "326a3ad9.081e7e"
+                "e4160067.4070c"
             ]
         ]
     },
     {
-        "id": "dc3d15fa.81276",
+        "id": "89d8cb14.97ad38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4083.527099609375,
-        "y": 2524.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4186.09375,
+        "y": 2560.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "a9233954.28abb8"
+                "f68c7777.771208"
             ]
         ]
     },
     {
-        "id": "992d2ff.35fffd",
+        "id": "1aa1ec12.0bb82c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4230.909423828125,
-        "y": 2410.409942626953,
-        "z": "740154b1.db9c44",
+        "x": 4333.47607421875,
+        "y": 2445.976608276367,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "faa22dd5.212148",
-                "9949d4ef.001688"
+                "f0006d82.9607f",
+                "e28e5fb.1f15da"
             ]
         ]
     },
     {
-        "id": "326a3ad9.081e7e",
+        "id": "e4160067.4070c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4246.527099609375,
-        "y": 2470.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4349.09375,
+        "y": 2506.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "a9233954.28abb8",
+        "id": "f68c7777.771208",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4235.527099609375,
-        "y": 2525.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4338.09375,
+        "y": 2561.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "faa22dd5.212148",
+        "id": "f0006d82.9607f",
         "type": "set",
         "name": "set domain C node-id and tpn",
         "xml": "<set>\n<parameter name='domain-C.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-C.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4440.0269775390625,
-        "y": 2377.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4542.5936279296875,
+        "y": 2413.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "a9d72cbf.011738",
+        "id": "3a2030d6.3a864",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4010.0269775390625,
-        "y": 2672.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4112.5936279296875,
+        "y": 2708.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "9949d4ef.001688",
+        "id": "e28e5fb.1f15da",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4419.0269775390625,
-        "y": 2428.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4521.5936279296875,
+        "y": 2464.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "b61d11ba.55b168"
+                "6f7c8401.0c5c44"
             ]
         ]
     },
     {
-        "id": "ce4f5014.a0532",
+        "id": "8657cf90.772ff",
         "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.dst-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3930.0269775390625,
-        "y": 2275.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4032.5936279296875,
+        "y": 2311.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "3a973be3.1f749c",
-                "bccf88ee.38b55"
+                "1edc2bcc.25093c",
+                "7c75489d.8c3e48"
             ]
         ]
     },
     {
-        "id": "bccf88ee.38b55",
+        "id": "7c75489d.8c3e48",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4151.0269775390625,
-        "y": 2243.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4253.5936279296875,
+        "y": 2279.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "f5e2899d.2e99e8"
+                "1008d1fe.94472e"
             ]
         ]
     },
     {
-        "id": "3a973be3.1f749c",
+        "id": "1edc2bcc.25093c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4151.0269775390625,
-        "y": 2290.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4253.5936279296875,
+        "y": 2326.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c9477994.8451e8"
+                "409a6e6.a5b3f9"
             ]
         ]
     },
     {
-        "id": "f5e2899d.2e99e8",
+        "id": "1008d1fe.94472e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4316.0269775390625,
-        "y": 2240.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4418.5936279296875,
+        "y": 2276.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "aecbcfe0.6e5048"
+                "e91b8d2.d0cd6f"
             ]
         ]
     },
     {
-        "id": "aecbcfe0.6e5048",
+        "id": "e91b8d2.d0cd6f",
         "type": "set",
         "name": "set domain-C.ltpId",
         "xml": "<set>\n<parameter name='domain-C.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4512.0269775390625,
-        "y": 2237.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4614.5936279296875,
+        "y": 2273.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "c9477994.8451e8",
+        "id": "409a6e6.a5b3f9",
         "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": 4318.0269775390625,
-        "y": 2290.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4420.5936279296875,
+        "y": 2326.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "abda304.2cd6cd",
+        "id": "8a9fa566.6d58a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5032.5269775390625,
-        "y": 2430.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5135.0936279296875,
+        "y": 2466.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "5c6e614a.9cad28",
-                "37c15682.dfe52a",
-                "ea1db027.01377"
+                "7fa0b1d.d6b0bd",
+                "7faa7643.b3f3a8",
+                "2f37cf12.b49ef8"
             ]
         ]
     },
     {
-        "id": "8a710596.36ea6",
+        "id": "19157173.11a35f",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4819.5269775390625,
-        "y": 2429.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4922.0936279296875,
+        "y": 2465.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "abda304.2cd6cd"
+                "8a9fa566.6d58a8"
             ]
         ]
     },
     {
-        "id": "2dbd68c.e7c9e98",
+        "id": "c29c48f8.7f86a8",
         "type": "set",
         "name": "set domain C tunnel tp id",
         "xml": "<set>\n<parameter name='domain-C.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4664.0269775390625,
-        "y": 2617.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4766.5936279296875,
+        "y": 2653.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "b61d11ba.55b168",
+        "id": "6f7c8401.0c5c44",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4614.0269775390625,
-        "y": 2428.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4716.5936279296875,
+        "y": 2464.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "8a710596.36ea6"
+                "19157173.11a35f"
             ]
         ]
     },
     {
-        "id": "ea1db027.01377",
+        "id": "2f37cf12.b49ef8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5238.0269775390625,
-        "y": 2508.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5340.5936279296875,
+        "y": 2544.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "12cd95a6.c3a7d2",
+        "id": "be660170.47dfc",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-B.ltpId is not used anymore",
         "comments": "",
-        "x": 4555.0269775390625,
-        "y": 2209.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 4657.5936279296875,
+        "y": 2245.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "5c6e614a.9cad28",
+        "id": "7fa0b1d.d6b0bd",
         "type": "set",
         "name": "set domain C network-id",
         "xml": "<set>\n<parameter name='tmp.domain-C.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5302.5269775390625,
-        "y": 2406.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5405.0936279296875,
+        "y": 2442.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "37c15682.dfe52a",
+        "id": "7faa7643.b3f3a8",
         "type": "get-resource",
         "name": "get-resource dst network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-C.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5312.5269775390625,
-        "y": 2452.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5415.0936279296875,
+        "y": 2488.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "826de71a.33a62"
+                "e4da28c1.f29fa8"
             ]
         ]
     },
     {
-        "id": "826de71a.33a62",
+        "id": "e4da28c1.f29fa8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5528.0269775390625,
-        "y": 2443.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5630.5936279296875,
+        "y": 2479.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "2f251a3.863a066"
+                "93b6182a.3d472"
             ]
         ]
     },
     {
-        "id": "2f251a3.863a066",
+        "id": "93b6182a.3d472",
         "type": "set",
         "name": "set domain B network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-C.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-C.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-C.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-C.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-C.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfoProtect`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 5782.5269775390625,
-        "y": 2449.7542724609375,
-        "z": "740154b1.db9c44",
+        "x": 5885.0936279296875,
+        "y": 2485.3209381103516,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "825fbafd.18c12",
+        "id": "4ccd67a2.a775c8",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689.199951171875,
-        "y": 268.0833282470703,
-        "z": "740154b1.db9c44",
+        "x": 2791.7666015625,
+        "y": 303.6499938964844,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "88dc17ca.c3603",
-                "d63ef024.cfef08"
+                "aa20e714.81e31",
+                "2de4f8e2.b5cb18"
             ]
         ]
     },
     {
-        "id": "88dc17ca.c3603",
+        "id": "aa20e714.81e31",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2880.199951171875,
-        "y": 272.0833282470703,
-        "z": "740154b1.db9c44",
+        "x": 2982.7666015625,
+        "y": 307.6499938964844,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "85988dae.be2118"
+                "4f32b0ce.2765f8"
             ]
         ]
     },
     {
-        "id": "85988dae.be2118",
+        "id": "4f32b0ce.2765f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3007.199951171875,
-        "y": 271.0833282470703,
-        "z": "740154b1.db9c44",
+        "x": 3109.7666015625,
+        "y": 306.6499938964844,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "1486884a.a84de"
+                "fabeb9f8.04ca88"
             ]
         ]
     },
     {
-        "id": "1486884a.a84de",
+        "id": "fabeb9f8.04ca88",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3230.083251953125,
-        "y": 265.9666442871094,
-        "z": "740154b1.db9c44",
+        "x": 3332.64990234375,
+        "y": 301.53330993652344,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "baa46e2a.1397b",
-                "5009aa1a.49b42c"
+                "412e1237.d5a904",
+                "43345576.1d340c"
             ]
         ]
     },
     {
-        "id": "baa46e2a.1397b",
+        "id": "412e1237.d5a904",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3437.083251953125,
-        "y": 202.96664428710938,
-        "z": "740154b1.db9c44",
+        "x": 3539.64990234375,
+        "y": 238.53330993652344,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "9723b3.a56f645"
+                "f849ec26.60ce68"
             ]
         ]
     },
     {
-        "id": "5009aa1a.49b42c",
+        "id": "43345576.1d340c",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3367.083251953125,
-        "y": 393.9666748046875,
-        "z": "740154b1.db9c44",
+        "x": 3469.64990234375,
+        "y": 429.53334045410156,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "9e442fe7.197ca8"
+                "2b8c6199.dff38e"
             ]
         ]
     },
     {
-        "id": "9723b3.a56f645",
+        "id": "f849ec26.60ce68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3579.083251953125,
-        "y": 192.96664428710938,
-        "z": "740154b1.db9c44",
+        "x": 3681.64990234375,
+        "y": 228.53330993652344,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "74ae9ae0.0891cc",
-                "a08d8202.0e48d8"
+                "7903a049.c8cd48",
+                "db701786.21e23"
             ]
         ]
     },
     {
-        "id": "9e442fe7.197ca8",
+        "id": "2b8c6199.dff38e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3493.083251953125,
-        "y": 393.9666748046875,
-        "z": "740154b1.db9c44",
+        "x": 3595.64990234375,
+        "y": 429.53334045410156,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "7af5d9ce.fbbb7"
+                "66a832b6.6cd354"
             ]
         ]
     },
     {
-        "id": "821af63c.9d499",
+        "id": "27e9a268.b581ce",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2489.966796875,
-        "y": 271.0833435058594,
-        "z": "740154b1.db9c44",
+        "x": 2592.533447265625,
+        "y": 306.65000915527344,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "825fbafd.18c12"
+                "4ccd67a2.a775c8"
             ]
         ]
     },
     {
-        "id": "d63ef024.cfef08",
+        "id": "2de4f8e2.b5cb18",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2884.933349609375,
-        "y": 224.0833282470703,
-        "z": "740154b1.db9c44",
+        "x": 2987.5,
+        "y": 259.6499938964844,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "3d7e803.580f08"
+                "fe5f3417.d45418"
             ]
         ]
     },
     {
-        "id": "74ae9ae0.0891cc",
+        "id": "7903a049.c8cd48",
         "type": "set",
         "name": "set otnTopoIdDst",
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3737.666748046875,
-        "y": 172.0833282470703,
-        "z": "740154b1.db9c44",
+        "x": 3840.2333984375,
+        "y": 207.64999389648438,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "a08d8202.0e48d8",
+        "id": "db701786.21e23",
         "type": "set",
         "name": "set otnTopoIdDstBackup",
         "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3759.666748046875,
-        "y": 220.0833282470703,
-        "z": "740154b1.db9c44",
+        "x": 3862.2333984375,
+        "y": 255.64999389648438,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "7af5d9ce.fbbb7",
+        "id": "66a832b6.6cd354",
         "type": "set",
         "name": "set otnTopoIdDst",
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3663.666748046875,
-        "y": 394.0833435058594,
-        "z": "740154b1.db9c44",
+        "x": 3766.2333984375,
+        "y": 429.65000915527344,
+        "z": "a133aed2.437bc",
         "wires": []
     },
     {
-        "id": "dccf569f.2f16c",
+        "id": "cc22664a.751d9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2558.683349609375,
-        "y": 345.8833312988281,
-        "z": "740154b1.db9c44",
+        "x": 2661.25,
+        "y": 381.4499969482422,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "bb64af5d.7bf708"
+                "2f2b5b65.5b64dc"
             ]
         ]
     },
     {
-        "id": "bb64af5d.7bf708",
+        "id": "2f2b5b65.5b64dc",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2757.91650390625,
-        "y": 342.88331604003906,
-        "z": "740154b1.db9c44",
+        "x": 2860.483154296875,
+        "y": 378.4499816894531,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "c6cf934.ca6387"
+                "36697354.fca184"
             ]
         ]
     },
     {
-        "id": "c6cf934.ca6387",
+        "id": "36697354.fca184",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2948.91650390625,
-        "y": 346.88331604003906,
-        "z": "740154b1.db9c44",
+        "x": 3051.483154296875,
+        "y": 382.4499816894531,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "84398364.2e39d"
+                "5c3e361c.5c18a8"
             ]
         ]
     },
     {
-        "id": "84398364.2e39d",
+        "id": "5c3e361c.5c18a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3075.91650390625,
-        "y": 345.88331604003906,
-        "z": "740154b1.db9c44",
+        "x": 3178.483154296875,
+        "y": 381.4499816894531,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "cdc2b636.8886c8",
+        "id": "b1b9b64d.59ccf8",
         "type": "switchNode",
         "name": "switch secondarySolutions empty?",
         "xml": "<switch test='`length($otn-oof.secondarySolutions) == 0`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1419.566650390625,
-        "y": 1649.566650390625,
-        "z": "740154b1.db9c44",
+        "x": 1522.13330078125,
+        "y": 1685.133316040039,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "930ebbc8.d33d1",
-                "e9824426.b9b25"
+                "65a1fc27.84c2b4",
+                "d975b6ca.6d1d08"
             ]
         ]
     },
     {
-        "id": "930ebbc8.d33d1",
+        "id": "65a1fc27.84c2b4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1645.4666748046875,
-        "y": 1621.566650390625,
-        "z": "740154b1.db9c44",
+        "x": 1748.0333251953125,
+        "y": 1657.133316040039,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "82cb40cb.6ece7"
+                "c43f0dda.93b268"
             ]
         ]
     },
     {
-        "id": "e9824426.b9b25",
+        "id": "d975b6ca.6d1d08",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1643.4666748046875,
-        "y": 1671.566650390625,
-        "z": "740154b1.db9c44",
+        "x": 1746.0333251953125,
+        "y": 1707.133316040039,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "82cb40cb.6ece7",
+        "id": "c43f0dda.93b268",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1787.566650390625,
-        "y": 1621.566650390625,
-        "z": "740154b1.db9c44",
+        "x": 1890.13330078125,
+        "y": 1657.133316040039,
+        "z": "a133aed2.437bc",
         "wires": [
             []
         ]
     },
     {
-        "id": "7d4b4351.930cbc",
+        "id": "949527f9.d2ae5",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 798.4666748046875,
-        "y": 1838.566650390625,
-        "z": "740154b1.db9c44",
+        "x": 901.0333251953125,
+        "y": 1874.133316040039,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "9310b044.9b3228"
+                "c20cf138.dc1e5"
             ]
         ]
     },
     {
-        "id": "9310b044.9b3228",
+        "id": "c20cf138.dc1e5",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 984.4666748046875,
-        "y": 1839.566650390625,
-        "z": "740154b1.db9c44",
+        "x": 1087.0333251953125,
+        "y": 1875.133316040039,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "40a7bba6.ae5b54"
+                "2941d5fe.c9ad8a"
             ]
         ]
     },
     {
-        "id": "40a7bba6.ae5b54",
+        "id": "2941d5fe.c9ad8a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1114.4666748046875,
-        "y": 1839.566650390625,
-        "z": "740154b1.db9c44",
+        "x": 1217.0333251953125,
+        "y": 1875.133316040039,
+        "z": "a133aed2.437bc",
         "wires": [
             [
-                "e1473f30.10032"
+                "c19998ca.837848"
             ]
         ]
     }
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 142ea566..61661e21 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
@@ -517,344 +517,706 @@
                                             </outcome>
                                             <outcome value='true'>
                                                 <block atomic="true">
-                                                    <block>
-                                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
-                                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                                <outcome value='uni'>
-                                                                    <block atomic="true">
-                                                                        <set>
-                                                                            <parameter name='tmp.aai.uni.' value='' />
-                                                                        </set>
-                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                      resource="uni"
-                                                                                      key="uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
-                                                                                      local-only="false"
-                                                                                      pfx="tmp.aai.uni" >
-                                                                            <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>
-                                                                            <outcome value='success'>
-                                                                                <block atomic="true"></block>
-                                                                            </outcome>
-                                                                        </get-resource>
-                                                                        <switch test="`$tmp.aai.uni.type`">
-                                                                            <outcome value='leaf'>
-                                                                                <block>
-                                                                                    <set>
-                                                                                        <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
-                                                                                    </set>
-                                                                                </block>
-                                                                            </outcome>
-                                                                            <outcome value='root'>
-                                                                                <block>
-                                                                                    <set>
-                                                                                        <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
-                                                                                    </set>
-                                                                                </block>
-                                                                            </outcome>
-                                                                            <outcome value='root-secondary'>
-                                                                                <block>
-                                                                                    <set>
-                                                                                        <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />
-                                                                                    </set>
-                                                                                </block>
-                                                                            </outcome>
-                                                                            <outcome value='Other'>
-                                                                                <block></block>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                            <parameter name="original_string" value='`$tmp.aai.uni.id`'/>
-                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                            <parameter name="regex" value="[-]+"/>
-                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-uni"/>
-                                                                            <outcome value='success'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
-                                                                                    </set>
-                                                                                </block>
-                                                                            </outcome>
-                                                                            <outcome value='failure'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='error-code' value='' />
-                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                        </execute>
-                                                                        <set>
-                                                                            <!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->
-                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />
-                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />
-                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />
-                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />
-                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />
-                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />
-                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
-                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
-                                                                            <parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />
-                                                                        </set>
-                                                                        <set>
-                                                                            <parameter name='`epidx`' value='`$epidx + 1`' />
-                                                                        </set>
-                                                                    </block>
-                                                                </outcome>
-                                                            </switch>
-                                                        </for>
-                                                        <set>
-                                                            <parameter name='filenameclleths' value="`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`" />
-                                                        </set>
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                                            <parameter name="filename" value="`$filenameclleths`" />
-                                                        </execute>
-                                                        <set>
-                                                            <parameter name='`otn-tunnels-name-list.`' value='' />
-                                                            <parameter name='`otn-tunnels-name-list_length`' value='0' />
-                                                            <parameter name='`otntunsidx`' value='0' />
-                                                        </set>
-                                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
-                                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                                <outcome value='vpn-binding'>
-                                                                    <block atomic="true">
-                                                                        <set>
-                                                                            <parameter name='tmp.aai.vpn-binding.' value='' />
-                                                                        </set>
-                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                      resource="vpn-binding"
-                                                                                      key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
-                                                                                      local-only="false"
-                                                                                      pfx="tmp.aai.vpn-binding" >
-                                                                            <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>
-                                                                            <outcome value='success'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                        <parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                        <parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />
-                                                                                    </set>
-                                                                                    <set>
-                                                                                        <parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />
-                                                                                    </set>
-                                                                                </block>
-                                                                            </outcome>
-                                                                        </get-resource>
-                                                                    </block>
-                                                                </outcome>
-                                                            </switch>
-                                                        </for>
-                                                        <set>
-                                                            <parameter name='filenamecllotns' value="`leafrootOTNtunnelnames`" />
-                                                        </set>
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                                            <parameter name="filename" value="`$filenamecllotns`" />
-                                                        </execute>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name='tmp.pnf-name-forUrl' value="`'networkId-providerId-' +
+                                                    <switch test="`$tmp.aai.connectivity.vpn-type`">
+                                                        <outcome value='leaf'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
+                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
+                                                                    <parameter name='`epidx`' value='0' />
+                                                                </set>
+                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                        <outcome value='uni'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.aai.uni.' value='' />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="uni"
+                                                                                              key="uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                              local-only="false"
+                                                                                              pfx="tmp.aai.uni" >
+                                                                                    <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>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true"></block>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                                <switch test="`$tmp.aai.uni.type`">
+                                                                                    <outcome value='leaf'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='root'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='root-secondary'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='Other'>
+                                                                                        <block></block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                    <parameter name="original_string" value='`$tmp.aai.uni.id`'/>
+                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-uni"/>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true">
+                                                                                            <set>
+                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='failure'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='error-code' value='' />
+                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                </execute>
+                                                                                <set>
+                                                                                    <!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='`epidx`' value='`$epidx + 1`' />
+                                                                                </set>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <set>
+                                                                    <parameter name='filenameclleths' value="`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`" />
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                    <parameter name="filename" value="`$filenameclleths`" />
+                                                                </execute>
+                                                                <set>
+                                                                    <parameter name='`otn-tunnels-name-list.`' value='' />
+                                                                    <parameter name='`otn-tunnels-name-list_length`' value='0' />
+                                                                    <parameter name='`otntunsidx`' value='0' />
+                                                                </set>
+                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                        <outcome value='vpn-binding'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.aai.vpn-binding.' value='' />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="vpn-binding"
+                                                                                              key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                              local-only="false"
+                                                                                              pfx="tmp.aai.vpn-binding" >
+                                                                                    <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>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true">
+                                                                                            <set>
+                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                                <parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />
+                                                                                            </set>
+                                                                                            <set>
+                                                                                                <parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <set>
+                                                                    <parameter name='filenamecllotns' value="`leafrootOTNtunnelnames`" />
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                    <parameter name="filename" value="`$filenamecllotns`" />
+                                                                </execute>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='tmp.pnf-name-forUrl' value="`'networkId-providerId-' +
                                                    $tmp.aai.connectivity.access-provider-id + '-clientId-' +
                                                    $tmp.aai.connectivity.access-client-id + '-topologyId-' +
                                                    $tmp.aai.connectivity.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.connectivity.access-node-id`" />
-                                                            </set>
-                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                          resource="pnf"
-                                                                          key="pnf.pnf-name = $tmp.pnf-name-forUrl"
-                                                                          pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                <!--AND depth = '0'"-->
-                                                                <outcome value='success'>
-                                                                    <block>
-                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                            <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                <outcome value='esr-thirdparty-sdnc'>
-                                                                                    <block atomic="true">
-                                                                                        <set>
-                                                                                            <parameter name='tmp.domainConn.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                        </set>
-                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                      resource="esr-thirdparty-sdnc"
-                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="pnf"
+                                                                                  key="pnf.pnf-name = $tmp.pnf-name-forUrl"
+                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                        <!--AND depth = '0'"-->
+                                                                        <outcome value='success'>
+                                                                            <block>
+                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                            <block atomic="true">
+                                                                                                <set>
+                                                                                                    <parameter name='tmp.domainConn.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                      pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >
-                                                                                            <outcome value='success'>
-                                                                                                <block>
-                                                                                                    <set>
-                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                        <!--<parameter name="format" value="json"/>-->
-                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                    </set>
-                                                                                                </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.connection-attachement.access-node-id`" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                            <outcome value='Other'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                        </get-resource>
-                                                                                    </block>
-                                                                                </outcome>
-                                                                            </switch>
-                                                                        </for>
-                                                                    </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.connection-attachement.access-node-id`" />
-                                                                    </return>
-                                                                </outcome>
-                                                                <outcome value='Other'>
-                                                                    <return status='failure'>
-                                                                        <parameter name='ack-final' value='Y'/>
-                                                                        <parameter name="error-code" value="500" />
-                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                    </return>
-                                                                </outcome>
-                                                            </get-resource>
-                                                        </block>
-                                                        <set>
-                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />
-                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
-                                                            <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
-                                                            <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
-                                                            <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
-                                                            <parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                            <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
-                                                            <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                            <!--<parameter name='index-number' value='0' />-->
-                                                            <!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->
-                                                            <!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->
-                                                            <!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
-                                                            <!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
-                                                            <!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->
-                                                        </set>
-                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`" />
-                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                            <parameter name="format" value="json"/>
-                                                            <parameter name="httpMethod" value="patch"/>
-                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                            <parameter name="responsePrefix" value="vpn-result"/>
-                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                            <parameter name="trustStorePassword" value="adminadmin"/>
-                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                            <parameter name="keyStorePassword" value="adminadmin"/>
-                                                            <outcome value='failure'></outcome>
-                                                            <outcome value='success'>
+                                                                                                              pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                    <outcome value='success'>
+                                                                                                        <block>
+                                                                                                            <set>
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            </set>
+                                                                                                        </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.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='Other'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </for>
+                                                                            </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.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='Other'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                </block>
+                                                                <set>
+                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />
+                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                    <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
+                                                                    <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
+                                                                    <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
+                                                                    <parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                    <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
+                                                                    <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                    <!--<parameter name='index-number' value='0' />-->
+                                                                    <!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->
+                                                                    <!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->
+                                                                    <!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
+                                                                    <!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
+                                                                    <!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`" />
+                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                    <parameter name="format" value="json"/>
+                                                                    <parameter name="httpMethod" value="patch"/>
+                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                    <parameter name="responsePrefix" value="vpn-result"/>
+                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                    <outcome value='failure'></outcome>
+                                                                    <outcome value='success'>
+                                                                        <block atomic="true">
+                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                    key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
+                                                                                <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
+                                                                                <parameter name='operational-status' value='Activated' />
+                                                                            </update>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="patch"/>
+                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                            </execute>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >
+                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                <!--<parameter name="deviceIp" value="192.168.198.6" />-->
+                                                                                <!--<parameter name="devicePort" value="18181" />-->
+                                                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                                <parameter name="format" value="json" />
+                                                                                <parameter name="httpMethod" value="post" />
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                                <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                                <parameter name="version" value="777" />
+                                                                                <parameter name="mode" value="sync" />
+                                                                                <!--<parameter name="version" value="sync" />-->
+                                                                                <!--<parameter name="mode" value="777" />-->
+                                                                                <parameter name="responsePrefix" value="restapi-result"/>
+                                                                            </execute>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >
+                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                <parameter name="format" value="json" />
+                                                                                <parameter name="httpMethod" value="get" />
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                                <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                                <parameter name="version" value="777" />
+                                                                                <parameter name="mode" value="sync" />
+                                                                                <!--<parameter name="version" value="sync" />-->
+                                                                                <!--<parameter name="mode" value="777" />-->
+                                                                                <parameter name="responsePrefix" value="notification-get-result"/>
+                                                                            </execute>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </execute>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='root'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
+                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
+                                                                    <parameter name='`epidx`' value='0' />
+                                                                </set>
+                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                        <outcome value='uni'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.aai.uni.' value='' />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="uni"
+                                                                                              key="uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                              local-only="false"
+                                                                                              pfx="tmp.aai.uni" >
+                                                                                    <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>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true"></block>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                                <switch test="`$tmp.aai.uni.type`">
+                                                                                    <outcome value='leaf'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='root'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='root-secondary'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='Other'>
+                                                                                        <block></block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                    <parameter name="original_string" value='`$tmp.aai.uni.id`'/>
+                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-uni"/>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true">
+                                                                                            <set>
+                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='failure'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='error-code' value='' />
+                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                </execute>
+                                                                                <set>
+                                                                                    <!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='`epidx`' value='`$epidx + 1`' />
+                                                                                </set>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <set>
+                                                                    <parameter name='filenameclleths' value="`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`" />
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                    <parameter name="filename" value="`$filenameclleths`" />
+                                                                </execute>
+                                                                <set>
+                                                                    <parameter name='`otn-tunnels-name-list.`' value='' />
+                                                                    <parameter name='`otn-tunnels-name-list_length`' value='0' />
+                                                                    <parameter name='`otntunsidx`' value='0' />
+                                                                </set>
+                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                        <outcome value='vpn-binding'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.aai.vpn-binding.' value='' />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="vpn-binding"
+                                                                                              key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                              local-only="false"
+                                                                                              pfx="tmp.aai.vpn-binding" >
+                                                                                    <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>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true">
+                                                                                            <set>
+                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                                <parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />
+                                                                                            </set>
+                                                                                            <set>
+                                                                                                <parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <set>
+                                                                    <parameter name='filenamecllotns' value="`leafrootOTNtunnelnames`" />
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                    <parameter name="filename" value="`$filenamecllotns`" />
+                                                                </execute>
                                                                 <block atomic="true">
-                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
-                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
-                                                                        <parameter name='operational-status' value='Activated' />
-                                                                    </update>
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`" />
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`" />
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                        <parameter name="format" value="json"/>
-                                                                        <parameter name="httpMethod" value="post"/>
-                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >
-                                                                        <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
-                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
-                                                                        <!--<parameter name="deviceIp" value="192.168.198.6" />-->
-                                                                        <!--<parameter name="devicePort" value="18181" />-->
-                                                                        <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
-                                                                        <parameter name="format" value="json" />
-                                                                        <parameter name="httpMethod" value="post" />
-                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                        <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
-                                                                        <parameter name="module" value="GENERIC-RESOURCE-API" />
-                                                                        <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                        <parameter name="version" value="`$project.version`" />
-                                                                        <parameter name="mode" value="sync" />
-                                                                        <parameter name="responsePrefix" value="restapi-result"/>
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >
-                                                                        <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
-                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
-                                                                        <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
-                                                                        <parameter name="format" value="json" />
-                                                                        <parameter name="httpMethod" value="get" />
-                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                        <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
-                                                                        <parameter name="module" value="GENERIC-RESOURCE-API" />
-                                                                        <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                        <parameter name="version" value="`$project.version`" />
-                                                                        <parameter name="mode" value="sync" />
-                                                                        <parameter name="responsePrefix" value="notification-get-result"/>
-                                                                    </execute>
+                                                                    <set>
+                                                                        <parameter name='tmp.pnf-name-forUrl' value="`'networkId-providerId-' +
+                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.connectivity.access-node-id`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="pnf"
+                                                                                  key="pnf.pnf-name = $tmp.pnf-name-forUrl"
+                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                        <!--AND depth = '0'"-->
+                                                                        <outcome value='success'>
+                                                                            <block>
+                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                            <block atomic="true">
+                                                                                                <set>
+                                                                                                    <parameter name='tmp.domainConn.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                              pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                    <outcome value='success'>
+                                                                                                        <block>
+                                                                                                            <set>
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            </set>
+                                                                                                        </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.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='Other'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </for>
+                                                                            </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.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='Other'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
                                                                 </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </block>
+                                                                <set>
+                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />
+                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                    <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
+                                                                    <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
+                                                                    <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
+                                                                    <parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                    <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
+                                                                    <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                    <!--<parameter name='index-number' value='0' />-->
+                                                                    <!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->
+                                                                    <!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->
+                                                                    <!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
+                                                                    <!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
+                                                                    <!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`" />
+                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                    <parameter name="format" value="json"/>
+                                                                    <parameter name="httpMethod" value="patch"/>
+                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                    <parameter name="responsePrefix" value="vpn-result"/>
+                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                    <outcome value='failure'></outcome>
+                                                                    <outcome value='success'>
+                                                                        <block atomic="true">
+                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                    key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
+                                                                                <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
+                                                                                <parameter name='operational-status' value='Activated' />
+                                                                            </update>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="patch"/>
+                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                            </execute>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >
+                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                <!--<parameter name="deviceIp" value="192.168.198.6" />-->
+                                                                                <!--<parameter name="devicePort" value="18181" />-->
+                                                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                                <parameter name="format" value="json" />
+                                                                                <parameter name="httpMethod" value="post" />
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                                <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                                <parameter name="version" value="777" />
+                                                                                <parameter name="mode" value="sync" />
+                                                                                <!--<parameter name="version" value="sync" />-->
+                                                                                <!--<parameter name="mode" value="777" />-->
+                                                                                <parameter name="responsePrefix" value="restapi-result"/>
+                                                                            </execute>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >
+                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                <parameter name="format" value="json" />
+                                                                                <parameter name="httpMethod" value="get" />
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                                <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                                <parameter name="version" value="777" />
+                                                                                <parameter name="mode" value="sync" />
+                                                                                <!--<parameter name="version" value="sync" />-->
+                                                                                <!--<parameter name="mode" value="777" />-->
+                                                                                <parameter name="responsePrefix" value="notification-get-result"/>
+                                                                            </execute>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </execute>
+                                                            </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-F1.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
index a874168f..32db942f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
@@ -186,9 +186,9 @@
                                     <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                     <parameter name='route-distinguisher' value='`$gfp`' />
                                     <parameter name='operational-status' value='Created' />
-                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                     <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                     <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                     <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
@@ -225,9 +225,9 @@
                                     <!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->
                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                 </save>
                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
@@ -290,9 +290,9 @@
                                     <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                     <parameter name='route-distinguisher' value='`$gfp`' />
                                     <parameter name='operational-status' value='Created' />
-                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                     <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                     <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                     <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
@@ -515,9 +515,9 @@
                                                 <parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                                 <parameter name='route-distinguisher' value='`$gfp`' />
                                                 <parameter name='operational-status' value='Created' />
-                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                 <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                                 <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                                 <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
@@ -554,9 +554,9 @@
                                                 <!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->
                                                 <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                 <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                 <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                             </save>
                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
@@ -619,9 +619,9 @@
                                                 <parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                                 <parameter name='route-distinguisher' value='`$gfp`' />
                                                 <parameter name='operational-status' value='Created' />
-                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                 <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                                 <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                                 <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
index c71b7aa3..ea5afbad 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
@@ -1,6 +1,6 @@
 <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}'>
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='777'>
     <method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>
         <block atomic="true">
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
@@ -25,8 +25,14 @@
             <!--	AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->
             <!--	  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->
             <!--	  AND service-instance.service-instance-id =  $rcvd-service-instance-id"  force="true" pfx="tmp.AnAI-data">-->
+            <!--<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"-->
+            <!-- key="service-instance.service-instance-id =  $rcvd-service-instance-id"  force="true" pfx="tmp.AnAI-data">-->
+            <!--    <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />-->
+            <!--    <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />-->
             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
-                  key="service-instance.service-instance-id =  $rcvd-service-instance-id"  force="true" pfx="tmp.AnAI-data">
+                  key="service-instance.service-instance-id =  $rcvd-service-instance-id
+ AND customer.global-customer-id = '5GCustomer'
+ AND service-subscription.service-type = '5G'"  force="true" pfx="tmp.AnAI-data">
                 <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />
                 <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />
             </save>
@@ -45,17 +51,20 @@
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`" />
-                <parameter name="restapiUrl" value="`$prop.dcaeAddrAndPort + '/eventListener/v7'`" />
-                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />-->
-                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />-->
+                <!--<parameter name="restapiUrl" value="`$prop.dcaeAddrAndPort + '/eventListener/v7'`" />-->
+                <parameter name="restapiUrl" value="https://dcae-ves-collector:8443/eventListener/v7" />
+                <parameter name="restapiUser" value="sample1" />
+                <parameter name="restapiPassword" value="sample1" />
                 <parameter name="format" value="json"/>
                 <parameter name="httpMethod" value="post"/>
                 <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
                 <parameter name="responsePrefix" value="ves-result"/>
                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                 <parameter name="trustStorePassword" value="adminadmin"/>
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                <parameter name="keyStorePassword" value="adminadmin"/>
+                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                <parameter name="disableHostVerification" value="true"/>
+                <parameter name="ssl" value="false"/>
             </execute>
         </block>
     </method>
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 325b58bd..85b0fca0 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
@@ -35,12 +35,12 @@
                             <block>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                               resource="pnfs"
-                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'"
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0"
                                               local-only="false"
                                               pfx="ccsdkTopopnfs" ></get-resource>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                               resource="logical-links"
-                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'"
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'"
                                               local-only="false"
                                               pfx="ccsdkTopologicalLinks" ></get-resource>
                                 <set>
@@ -993,10 +993,10 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                                    <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                    <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
                                                                                                                       key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1060,10 +1060,10 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                                    <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                    <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
                                                                                                                       key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1154,10 +1154,10 @@
                                                                                                                                             <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                             <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                             <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                                                            <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                                            <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                            <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                            <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                                            <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                         </save>
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
                                                                                                                                               key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1217,10 +1217,10 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                                    <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                    <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
                                                                                                                       key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
@@ -1470,10 +1470,10 @@
                                                                                                                                             <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                             <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                             <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                                                            <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                                            <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                            <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                            <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                                            <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                         </save>
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
                                                                                                                                               key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
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 7c1d8733..acae25e5 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
@@ -978,9 +978,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1044,9 +1044,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1137,9 +1137,9 @@
                                                                                                                                             <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                             <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                             <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                            <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                            <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                            <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                                             <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                         </save>
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1200,9 +1200,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1819,9 +1819,9 @@
                                                                                                                                                         <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                                         <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                                         <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                                        <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                                        <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                                        <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                                                         <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                                     </save>
                                                                                                                                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
diff --git a/platform-logic/restapi-templates/src/main/json/cll-call-ves.json b/platform-logic/restapi-templates/src/main/json/cll-call-ves.json
index 0074c34c..ac502c65 100644
--- a/platform-logic/restapi-templates/src/main/json/cll-call-ves.json
+++ b/platform-logic/restapi-templates/src/main/json/cll-call-ves.json
@@ -3,7 +3,7 @@
     "commonEventHeader": {
       "version": "4.0.1",
       "vesEventListenerVersion": "7.0.1",
-      "domain": "ccvpnNotification",
+      "domain": "notification",
       "eventName": "ccvpnNotification_CloudLeaseLine_BandwidthChanged",
       "eventId": ${eventIdUuid},
       "lastEpochMicrosec": 8745745764578,
@@ -14,10 +14,10 @@
       "startEpochMicrosec": 8745745764578,
       "timeZoneOffset": "UTC-05.00"
     },
-    "ccvpnNotificationFields": {
+    "notificationFields": {
       "changeIdentifier": "PM_BW_UPDATE",
       "changeType": "BandwidthChanged",
-      "ccvpnNotificationFieldsVersion": "2.0",
+      "notificationFieldsVersion": "2.0",
       "arrayOfNamedHashMap": [
         {
           "name": ${eventNameUuid},
-- 
2.16.6