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

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 035df45..b318a73 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,199 +1,199 @@
 [\r
     {\r
-        "id": "b052f7e.a3d5288",\r
+        "id": "190659b8.bcae0e",\r
         "type": "save",\r
         "name": "get all-vpn-bindings from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 356.75,\r
-        "y": 462,\r
-        "z": "111f91bb.269a56",\r
+        "x": 353.566650390625,\r
+        "y": 335,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "e207ef26.f8a29",\r
-                "15b30bbc.e66fc4",\r
-                "c73b1c6f.dfba4"\r
+                "b2e66c4e.a3d2f8",\r
+                "35dfe125.6c620e",\r
+                "69d67799.ffee68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e207ef26.f8a29",\r
+        "id": "b2e66c4e.a3d2f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 544.75,\r
-        "y": 475,\r
-        "z": "111f91bb.269a56",\r
+        "x": 541.566650390625,\r
+        "y": 348,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "53374de6.fbbc9c"\r
+                "a7669132.5699f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15b30bbc.e66fc4",\r
+        "id": "35dfe125.6c620e",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 552.2409362792969,\r
-        "y": 517.5740356445312,\r
-        "z": "111f91bb.269a56",\r
+        "x": 549.0575866699219,\r
+        "y": 390.57403564453125,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c73b1c6f.dfba4",\r
+        "id": "69d67799.ffee68",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 542.75,\r
-        "y": 564,\r
-        "z": "111f91bb.269a56",\r
+        "x": 539.566650390625,\r
+        "y": 437,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "1d9a3789.c423c"\r
+                "7627d017.e729d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53374de6.fbbc9c",\r
+        "id": "a7669132.5699f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 717.75,\r
-        "y": 473,\r
-        "z": "111f91bb.269a56",\r
+        "x": 714.566650390625,\r
+        "y": 346,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "74134804.4c5ab"\r
+                "efea1cd6.23d6f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74134804.4c5ab",\r
+        "id": "efea1cd6.23d6f8",\r
         "type": "for",\r
         "name": "for vpnidx in all-vpn-bindings",\r
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 946.75,\r
-        "y": 474,\r
-        "z": "111f91bb.269a56",\r
+        "x": 943.566650390625,\r
+        "y": 347,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "88398d04.70bb08"\r
+                "afe63db8.26dbd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88398d04.70bb08",\r
+        "id": "afe63db8.26dbd8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1161.75,\r
-        "y": 475,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1158.566650390625,\r
+        "y": 348,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "60755719.5aec98"\r
+                "46ace79f.7f246"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23c1dec0.4bd442",\r
+        "id": "356939c7.7d339e",\r
         "type": "switchNode",\r
         "name": "switch vpnuuid is for this slice",\r
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1415.75,\r
-        "y": 397,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1412.566650390625,\r
+        "y": 270,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "14654146.223b47",\r
-                "d151f4bf.d5f298"\r
+                "a076eac6.b4101",\r
+                "488c763c.46cdf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14654146.223b47",\r
+        "id": "a076eac6.b4101",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1632.75,\r
-        "y": 376,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1629.566650390625,\r
+        "y": 249,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "60755719.5aec98"\r
+                "46ace79f.7f246"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d151f4bf.d5f298",\r
+        "id": "488c763c.46cdf",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1632.75,\r
-        "y": 425,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1629.566650390625,\r
+        "y": 298,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "60755719.5aec98",\r
+        "id": "46ace79f.7f246",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1816.75,\r
-        "y": 462,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1813.566650390625,\r
+        "y": 335,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "e58078ca.32c2b8",\r
-                "db55a5db.cc9e2",\r
-                "d1721022.90ae5"\r
+                "5d0d530d.21fb2c",\r
+                "d6a4c941.f116b8",\r
+                "84203861.d12558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebc2ede2.3e82f8",\r
+        "id": "578597dc.f76518",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 175.75,\r
-        "y": 203,\r
-        "z": "111f91bb.269a56",\r
+        "x": 172.566650390625,\r
+        "y": 76,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "19d2750a.7ada53"\r
+                "3273c1f.6d67d3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19d2750a.7ada53",\r
+        "id": "3273c1f.6d67d3e",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -201,3651 +201,3712 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 460.0356903076172,\r
-        "y": 264.23810863494873,\r
-        "z": "111f91bb.269a56",\r
+        "x": 456.8523406982422,\r
+        "y": 137.23810863494873,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "32b35910.0922e6"\r
+                "bc88585a.07ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32b35910.0922e6",\r
+        "id": "bc88585a.07ae",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 466.17860412597656,\r
-        "y": 349.0000305175781,\r
-        "z": "111f91bb.269a56",\r
+        "x": 462.99525451660156,\r
+        "y": 222.00003051757812,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "9f4c6f10.a708b"\r
+                "c722c351.6c9218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f4c6f10.a708b",\r
+        "id": "c722c351.6c9218",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 775.988037109375,\r
-        "y": 340.66668701171875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 772.8046875,\r
+        "y": 213.66668701171875,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "b052f7e.a3d5288",\r
-                "14b40144.c74357",\r
-                "8371652a.c1422",\r
-                "ab74b4be.cbc48",\r
-                "77984a30.f32474"\r
+                "190659b8.bcae0e",\r
+                "faef4429.aa2c8",\r
+                "54215ea2.f0c928",\r
+                "8ba173b9.e36f",\r
+                "e82defb9.e02d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e58078ca.32c2b8",\r
+        "id": "5d0d530d.21fb2c",\r
         "type": "set",\r
         "name": "set tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
         "comments": "",\r
-        "x": 2033.75,\r
-        "y": 400,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2030.566650390625,\r
+        "y": 273,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bd448e7d.80d888",\r
+        "id": "6fabd371.f1d30c",\r
         "type": "set",\r
         "name": "set attachment_param for OTN A",\r
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 4202.75,\r
-        "y": 286,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4199.566650390625,\r
+        "y": 159,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "13f5ead.1dca895",\r
+        "id": "aa17cc43.b708b",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4283.75,\r
-        "y": 601,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4280.566650390625,\r
+        "y": 474,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "322b352.ceea84a",\r
-                "b686bcae.ff7c7"\r
+                "709fb1ba.ca1bd",\r
+                "a7a19ece.dc1ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "322b352.ceea84a",\r
+        "id": "709fb1ba.ca1bd",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4593.25,\r
-        "y": 570,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4590.066650390625,\r
+        "y": 443,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "1e1970be.0764a7"\r
+                "5cd036bd.ebcf28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b686bcae.ff7c7",\r
+        "id": "a7a19ece.dc1ae",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4598.25,\r
-        "y": 635,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4595.066650390625,\r
+        "y": 508,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "bd24692b.5a8508"\r
+                "fddf1c47.d3871"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e1970be.0764a7",\r
+        "id": "5cd036bd.ebcf28",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 4769.25,\r
-        "y": 570,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4766.066650390625,\r
+        "y": 443,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bd24692b.5a8508",\r
+        "id": "fddf1c47.d3871",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4764.75,\r
-        "y": 635,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4761.566650390625,\r
+        "y": 508,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bdfec131.c9a298",\r
+        "id": "41b8dfa5.7b07b8",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
         "comments": "",\r
-        "x": 4148.25,\r
-        "y": 855,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4145.066650390625,\r
+        "y": 728,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "68cdfef7.64c51",\r
+        "id": "a2bed09b.bd073",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4302.25,\r
-        "y": 903,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4299.066650390625,\r
+        "y": 776,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "534fa647.cdf3",\r
-                "626cbb12.a73134"\r
+                "8f1feb66.a203a8",\r
+                "bdea130f.d138e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "534fa647.cdf3",\r
+        "id": "8f1feb66.a203a8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4647.75,\r
-        "y": 884,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4644.566650390625,\r
+        "y": 757,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "2db65967.f1a87e"\r
+                "2db058d.5e37da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "626cbb12.a73134",\r
+        "id": "bdea130f.d138e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4651.75,\r
-        "y": 924,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4648.566650390625,\r
+        "y": 797,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "54fc5ed8.18991"\r
+                "bfbb3301.3c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2db65967.f1a87e",\r
+        "id": "2db058d.5e37da8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 4805.75,\r
-        "y": 884,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4802.566650390625,\r
+        "y": 757,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "54fc5ed8.18991",\r
+        "id": "bfbb3301.3c3",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4809.25,\r
-        "y": 924,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4806.066650390625,\r
+        "y": 797,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "5bbebd3d.56e454",\r
-                "7821e9b0.59a868"\r
+                "737d402b.600cc",\r
+                "9643556e.80a7d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5bbebd3d.56e454",\r
+        "id": "737d402b.600cc",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5139.75,\r
-        "y": 889,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5136.566650390625,\r
+        "y": 762,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "72ed7974.8997",\r
+        "id": "340d03c1.bc10a4",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 5003.75,\r
-        "y": 848,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5000.566650390625,\r
+        "y": 721,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7821e9b0.59a868",\r
+        "id": "9643556e.80a7d8",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5066.75,\r
-        "y": 935,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5063.566650390625,\r
+        "y": 808,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "47a40348.350864",\r
+        "id": "3e996a09.c24c1e",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 4140.75,\r
-        "y": 334,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4137.566650390625,\r
+        "y": 207,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e86c4698.44de68",\r
+        "id": "73cd2276.fc690c",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4166.75,\r
-        "y": 451,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4163.566650390625,\r
+        "y": 324,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "3bef2a94.7a3c56",\r
-                "8e5e548f.b7d088",\r
-                "9e92c765.4c36e"\r
+                "2ce54c47.fa0e34",\r
+                "f2bf065e.86763",\r
+                "a6105f6e.dd58c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bef2a94.7a3c56",\r
+        "id": "2ce54c47.fa0e34",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4362.2501220703125,\r
-        "y": 403,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4359.0667724609375,\r
+        "y": 276,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "8ae11b21.8072d"\r
+                "ed0df0d0.842f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e5e548f.b7d088",\r
+        "id": "f2bf065e.86763",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4354.2501220703125,\r
-        "y": 458,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4351.0667724609375,\r
+        "y": 331,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "85930301.e40178"\r
+                "40cafd9.39fe684"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ae11b21.8072d",\r
+        "id": "ed0df0d0.842f2",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4506.6324462890625,\r
-        "y": 402.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4503.4490966796875,\r
+        "y": 275.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "2b001bb5.f3beac"\r
+                "404c86f.cf51c78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44cbb5eb.fe11fc",\r
+        "id": "4841f833.0282b8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5088.75,\r
-        "y": 405,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5085.566650390625,\r
+        "y": 278,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "8828c3a6.4773b"\r
+                "13a4c0ae.89b21f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b001bb5.f3beac",\r
+        "id": "404c86f.cf51c78",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4690.75,\r
-        "y": 401,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4687.566650390625,\r
+        "y": 274,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "e234651a.d8201"\r
+                "b62cc523.462948"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e234651a.d8201",\r
+        "id": "b62cc523.462948",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4885.75,\r
-        "y": 401,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4882.566650390625,\r
+        "y": 274,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "44cbb5eb.fe11fc"\r
+                "4841f833.0282b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e92c765.4c36e",\r
+        "id": "a6105f6e.dd58c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4359.2501220703125,\r
-        "y": 515,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4356.0667724609375,\r
+        "y": 388,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "2e1c6b8c.8fd4dc"\r
+                "62b98530.ba575c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e1c6b8c.8fd4dc",\r
+        "id": "62b98530.ba575c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4511.2501220703125,\r
-        "y": 516,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4508.0667724609375,\r
+        "y": 389,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "85930301.e40178",\r
+        "id": "40cafd9.39fe684",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4522.2501220703125,\r
-        "y": 459,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4519.0667724609375,\r
+        "y": 332,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "90e4153e.8023d8",\r
+        "id": "ac0364e.0ddc498",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5473.75,\r
-        "y": 418,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5470.566650390625,\r
+        "y": 291,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "bac51d99.85cdd8",\r
-                "432bf875.253be8",\r
-                "32be30ae.8624b"\r
+                "52afc77f.66ed58",\r
+                "690d4481.5a01f4",\r
+                "561d9e01.bb6af8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8828c3a6.4773b",\r
+        "id": "13a4c0ae.89b21f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5267.75,\r
-        "y": 405,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5264.566650390625,\r
+        "y": 278,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "580b4f3c.2239f",\r
-                "90e4153e.8023d8"\r
+                "3f0e652f.aee95a",\r
+                "ac0364e.0ddc498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "580b4f3c.2239f",\r
+        "id": "3f0e652f.aee95a",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainA id",\r
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 5503.75,\r
-        "y": 366,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5500.566650390625,\r
+        "y": 239,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bac51d99.85cdd8",\r
+        "id": "52afc77f.66ed58",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5683.75,\r
-        "y": 409,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5680.566650390625,\r
+        "y": 282,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "7a8928ea.c03e88"\r
+                "2a8d9ba9.4de844"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "432bf875.253be8",\r
+        "id": "690d4481.5a01f4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5675.75,\r
-        "y": 464,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5672.566650390625,\r
+        "y": 337,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "609d607b.1ff68"\r
+                "54eb498f.c93a58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32be30ae.8624b",\r
+        "id": "561d9e01.bb6af8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5680.75,\r
-        "y": 521,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5677.566650390625,\r
+        "y": 394,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "e7f093f9.7ecc4"\r
+                "ab202d02.2d5188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7f093f9.7ecc4",\r
+        "id": "ab202d02.2d5188",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5832.75,\r
-        "y": 522,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5829.566650390625,\r
+        "y": 395,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "609d607b.1ff68",\r
+        "id": "54eb498f.c93a58",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5843.75,\r
-        "y": 467,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5840.566650390625,\r
+        "y": 340,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a8928ea.c03e88",\r
+        "id": "2a8d9ba9.4de844",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5828.13232421875,\r
-        "y": 406.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5824.948974609375,\r
+        "y": 279.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "d93996e8.177a9"\r
+                "fdb43e15.dd2458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d93996e8.177a9",\r
+        "id": "fdb43e15.dd2458",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 6042.75,\r
-        "y": 403,\r
-        "z": "111f91bb.269a56",\r
+        "x": 6039.566650390625,\r
+        "y": 276,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a51ca3ec.fcbd9",\r
+        "id": "ad465d2.36cfe2",\r
         "type": "set",\r
         "name": "set attachment_param for OTN B",\r
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 3609.75,\r
-        "y": 1743,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3606.566650390625,\r
+        "y": 1616,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "75a3839f.237ba4",\r
+        "id": "1622f07d.ae60d",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3672.75,\r
-        "y": 2072,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3669.566650390625,\r
+        "y": 1945,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "dce36923.840728",\r
-                "157f1852.8f7de8"\r
+                "e470471b.4d3ef",\r
+                "8ee5f8b0.1b5738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dce36923.840728",\r
+        "id": "e470471b.4d3ef",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3968.25,\r
-        "y": 2039,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3965.066650390625,\r
+        "y": 1912,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "c9eb5c3d.58ade8"\r
+                "fbda4868.d5b3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "157f1852.8f7de8",\r
+        "id": "8ee5f8b0.1b5738",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3973.25,\r
-        "y": 2104,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3970.066650390625,\r
+        "y": 1977,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ee455d7a.4369c"\r
+                "13ccd918.a15e2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9eb5c3d.58ade8",\r
+        "id": "fbda4868.d5b3c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 4136.25,\r
-        "y": 2039,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4133.066650390625,\r
+        "y": 1912,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee455d7a.4369c",\r
+        "id": "13ccd918.a15e2f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4146.75,\r
-        "y": 2104,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4143.566650390625,\r
+        "y": 1977,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "93204f2.1b4a73",\r
+        "id": "6aa679a5.fc13d8",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 3548.75,\r
-        "y": 1800,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3545.566650390625,\r
+        "y": 1673,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4ba3f303.c0a41c",\r
+        "id": "63f314c3.d2093c",\r
         "type": "get-resource",\r
         "name": "get-resource dst pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3568.75,\r
-        "y": 1897,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3565.566650390625,\r
+        "y": 1770,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "cb100a9c.e2d048",\r
-                "ffd6b507.6159d",\r
-                "7158557b.4eb374"\r
+                "cb2cd4ea.b10f5",\r
+                "da2dd809.2eaba8",\r
+                "b7e5de7f.bd9438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb100a9c.e2d048",\r
+        "id": "cb2cd4ea.b10f5",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3771.2501220703125,\r
-        "y": 1850,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3768.0667724609375,\r
+        "y": 1723,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "e6720bf0.83c908"\r
+                "92ce9c5d.eb149"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd6b507.6159d",\r
+        "id": "da2dd809.2eaba8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3763.2501220703125,\r
-        "y": 1905,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3760.0667724609375,\r
+        "y": 1778,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "80e1f285.9bd438"\r
+                "d2833ad2.c8fbd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6720bf0.83c908",\r
+        "id": "92ce9c5d.eb149",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3915.6324462890625,\r
-        "y": 1847.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3912.4490966796875,\r
+        "y": 1720.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "62828788.5424"\r
+                "7c59c7e4.737078"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62828788.5424",\r
+        "id": "7c59c7e4.737078",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4099.75,\r
-        "y": 1862,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4096.566650390625,\r
+        "y": 1735,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "151698eb.d8b1bf"\r
+                "4a60b77a.b003e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7158557b.4eb374",\r
+        "id": "b7e5de7f.bd9438",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3768.2501220703125,\r
-        "y": 1962,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3765.0667724609375,\r
+        "y": 1835,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "4f499dcc.5ccf54"\r
+                "482f9215.08666c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f499dcc.5ccf54",\r
+        "id": "482f9215.08666c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3920.2501220703125,\r
-        "y": 1963,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3917.0667724609375,\r
+        "y": 1836,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80e1f285.9bd438",\r
+        "id": "d2833ad2.c8fbd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3931.2501220703125,\r
-        "y": 1908,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3928.0667724609375,\r
+        "y": 1781,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "48500cb6.0a5974",\r
+        "id": "8251a2fe.8b6a98",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4497.75,\r
-        "y": 1866,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4494.566650390625,\r
+        "y": 1739,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "9253635.59581a"\r
+                "3fea75ef.6caa7a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "151698eb.d8b1bf",\r
+        "id": "4a60b77a.b003e",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4294.75,\r
-        "y": 1862,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4291.566650390625,\r
+        "y": 1735,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "48500cb6.0a5974"\r
+                "8251a2fe.8b6a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a71424bd.8e0678",\r
+        "id": "49b53839.01783",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4882.75,\r
-        "y": 1865,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4879.566650390625,\r
+        "y": 1738,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "a7626fee.35776",\r
-                "f55d0ed2.02e038",\r
-                "47407f5a.98f7f8"\r
+                "b2b3032.264fd8",\r
+                "373b81c5.683f3e",\r
+                "869370b9.925f48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9253635.59581a",\r
+        "id": "3fea75ef.6caa7a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4674.75,\r
-        "y": 1858,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4671.566650390625,\r
+        "y": 1731,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "3d578b8.a79bc74",\r
-                "a71424bd.8e0678"\r
+                "dd88623a.123e",\r
+                "49b53839.01783"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d578b8.a79bc74",\r
+        "id": "dd88623a.123e",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainB id",\r
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 4912.75,\r
-        "y": 1813,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4909.566650390625,\r
+        "y": 1686,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d6ea76ec.6a17f8",\r
+        "id": "8fb4dcc3.25c568",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5241.75,\r
-        "y": 1969,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5238.566650390625,\r
+        "y": 1842,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c34e3d1.56f314",\r
+        "id": "95a386c5.a58638",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5252.75,\r
-        "y": 1914,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5249.566650390625,\r
+        "y": 1787,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fae51f86.36cbd8",\r
+        "id": "738801a1.4d047",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5237.13232421875,\r
-        "y": 1853.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5233.948974609375,\r
+        "y": 1726.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "e7fe4b79.28daf8"\r
+                "710bce1a.dc395"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7fe4b79.28daf8",\r
+        "id": "710bce1a.dc395",\r
         "type": "set",\r
         "name": "set controller domainB data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 5451.75,\r
-        "y": 1850,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5448.566650390625,\r
+        "y": 1723,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a7626fee.35776",\r
+        "id": "b2b3032.264fd8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5092.75,\r
-        "y": 1856,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5089.566650390625,\r
+        "y": 1729,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "fae51f86.36cbd8"\r
+                "738801a1.4d047"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f55d0ed2.02e038",\r
+        "id": "373b81c5.683f3e",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5084.75,\r
-        "y": 1911,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5081.566650390625,\r
+        "y": 1784,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "2c34e3d1.56f314"\r
+                "95a386c5.a58638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47407f5a.98f7f8",\r
+        "id": "869370b9.925f48",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5089.75,\r
-        "y": 1968,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5086.566650390625,\r
+        "y": 1841,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "d6ea76ec.6a17f8"\r
+                "8fb4dcc3.25c568"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3dd6564a.788bea",\r
+        "id": "60036337.4eba24",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has dst-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3123.75,\r
-        "y": 814,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3120.566650390625,\r
+        "y": 687,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "4498685c.f8a9c8",\r
-                "ce59ca85.515708"\r
+                "3dc5eab6.536eee",\r
+                "c84ae496.428be8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4498685c.f8a9c8",\r
+        "id": "3dc5eab6.536eee",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3337.75,\r
-        "y": 851,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3334.566650390625,\r
+        "y": 724,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "b9aa4ba2.44d89"\r
+                "20d6afb2.5423d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce59ca85.515708",\r
+        "id": "c84ae496.428be8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3339.75,\r
-        "y": 789,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3336.566650390625,\r
+        "y": 662,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "50bc7adf.71a1d4"\r
+                "c6c4710b.3b446"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9aa4ba2.44d89",\r
+        "id": "20d6afb2.5423d",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2917.75,\r
-        "y": 2094,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2914.566650390625,\r
+        "y": 1967,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "28dcb01c.f45e6",\r
-                "415698c1.9dad18"\r
+                "f7e1076.b120ff8",\r
+                "38975d3e.e2ea2a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28dcb01c.f45e6",\r
+        "id": "f7e1076.b120ff8",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3170.75,\r
-        "y": 2128,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3167.566650390625,\r
+        "y": 2001,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "8cf945af.2f52c8"\r
+                "6af8dbb6.a59b4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "415698c1.9dad18",\r
+        "id": "38975d3e.e2ea2a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3170.75,\r
-        "y": 2072,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3167.566650390625,\r
+        "y": 1945,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "c8aba811.103238"\r
+                "2e5f8334.fd5e8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cf945af.2f52c8",\r
+        "id": "6af8dbb6.a59b4c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3321.75,\r
-        "y": 2128,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3318.566650390625,\r
+        "y": 2001,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb2e2de2.a53528",\r
+        "id": "d2d4d90e.2fae",\r
         "type": "set",\r
         "name": "set vpn-bindingA and connectivityA",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
         "comments": "",\r
-        "x": 4197.75,\r
-        "y": 226,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4194.566650390625,\r
+        "y": 99,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "15f47b8b.7e00dc",\r
+        "id": "33cb0d0f.4dfe6a",\r
         "type": "set",\r
         "name": "set vpn-bindingB and connectivityB",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
         "comments": "",\r
-        "x": 3605.75,\r
-        "y": 1685,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3602.566650390625,\r
+        "y": 1558,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9c2c3c17.6c4b68",\r
+        "id": "d855f72b.7e86a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3888.75,\r
-        "y": 483,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3885.566650390625,\r
+        "y": 356,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "eb2e2de2.a53528",\r
-                "bd448e7d.80d888",\r
-                "47a40348.350864",\r
-                "e86c4698.44de68",\r
-                "13f5ead.1dca895",\r
-                "94ce35b5.84e9d",\r
-                "9dbb6108.db3f08",\r
-                "7f10b67d.13cbf"\r
+                "d2d4d90e.2fae",\r
+                "6fabd371.f1d30c",\r
+                "3e996a09.c24c1e",\r
+                "73cd2276.fc690c",\r
+                "aa17cc43.b708b",\r
+                "2774aa91.aa9f06",\r
+                "8954306d.3c458",\r
+                "d41278c1.0e8268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8aba811.103238",\r
+        "id": "2e5f8334.fd5e8c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3321.75,\r
-        "y": 2071,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3318.566650390625,\r
+        "y": 1944,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "15f47b8b.7e00dc",\r
-                "a51ca3ec.fcbd9",\r
-                "93204f2.1b4a73",\r
-                "4ba3f303.c0a41c",\r
-                "75a3839f.237ba4",\r
-                "b13189f3.5c00c",\r
-                "72e7ea14.321c0c",\r
-                "a1c10f72.410b08"\r
+                "33cb0d0f.4dfe6a",\r
+                "ad465d2.36cfe2",\r
+                "6aa679a5.fc13d8",\r
+                "63f314c3.d2093c",\r
+                "1622f07d.ae60d",\r
+                "2d0bf44f.d7a87c",\r
+                "745353ea.a7c82c",\r
+                "a43e9ba4.30fe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30be8f1c.c2c68",\r
+        "id": "ea6929ec.54f7c8",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
         "comments": "",\r
-        "x": 3559.75,\r
-        "y": 2370,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3556.566650390625,\r
+        "y": 2243,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "60d95124.1573e8",\r
+        "id": "5471fe10.85fa48",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3713.75,\r
-        "y": 2418,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3710.566650390625,\r
+        "y": 2291,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "626c41a5.4a556",\r
-                "319f7c4c.700584"\r
+                "709844dc.12b89c",\r
+                "36a6ddd8.c214a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "626c41a5.4a556",\r
+        "id": "709844dc.12b89c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4059.25,\r
-        "y": 2399,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4056.066650390625,\r
+        "y": 2272,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "a16c0d6b.aa021"\r
+                "b6a9b933.1ec16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "319f7c4c.700584",\r
+        "id": "36a6ddd8.c214a2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4063.25,\r
-        "y": 2439,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4060.066650390625,\r
+        "y": 2312,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "c46066f7.6ad638"\r
+                "ef6de723.b6fb38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a16c0d6b.aa021",\r
+        "id": "b6a9b933.1ec16",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 4217.25,\r
-        "y": 2399,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4214.066650390625,\r
+        "y": 2272,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c46066f7.6ad638",\r
+        "id": "ef6de723.b6fb38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4220.75,\r
-        "y": 2439,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4217.566650390625,\r
+        "y": 2312,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "dbf72bce.fe4fd",\r
-                "da41ce10.71c4a8"\r
+                "dffbfe56.944988",\r
+                "8e76351f.3450b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbf72bce.fe4fd",\r
+        "id": "dffbfe56.944988",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4560.75,\r
-        "y": 2438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4557.566650390625,\r
+        "y": 2311,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a0a6a7a2.80538",\r
+        "id": "a2006b0c.836e18",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 4418.75,\r
-        "y": 2396,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4415.566650390625,\r
+        "y": 2269,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "da41ce10.71c4a8",\r
+        "id": "8e76351f.3450b",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4489.75,\r
-        "y": 2487,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4486.566650390625,\r
+        "y": 2360,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "509b9ad8.503f2c",\r
+        "id": "43b4f3be.c07abc",\r
         "type": "set",\r
         "name": "set attachment_param (gfp-n) for OTN",\r
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
         "comments": "",\r
-        "x": 3114.75,\r
-        "y": 754,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3111.566650390625,\r
+        "y": 627,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8edfc4cd.8a0528",\r
+        "id": "a5929ea4.d560e8",\r
         "type": "comment",\r
         "name": "only dst ttp exists. No src",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3709.75,\r
-        "y": 440,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3706.566650390625,\r
+        "y": 313,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f79b26c9.540128",\r
+        "id": "40338a80.0ff774",\r
         "type": "comment",\r
         "name": "only src ttp exists. No dst",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3266.75,\r
-        "y": 2018,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3263.566650390625,\r
+        "y": 1891,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50bc7adf.71a1d4",\r
+        "id": "c6c4710b.3b446",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3445.75,\r
-        "y": 602,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3442.566650390625,\r
+        "y": 475,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ebf4cc93.93ec7",\r
-                "8e7f6f60.66ae28"\r
+                "8c077d56.2d05a8",\r
+                "47f9e9e4.4ae948"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e7f6f60.66ae28",\r
+        "id": "47f9e9e4.4ae948",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3687.75,\r
-        "y": 1191,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3684.566650390625,\r
+        "y": 1064,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "d55e670.1fa9f18"\r
+                "32d70917.41b9b6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebf4cc93.93ec7",\r
+        "id": "8c077d56.2d05a8",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3681.75,\r
-        "y": 482,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3678.566650390625,\r
+        "y": 355,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "9c2c3c17.6c4b68"\r
+                "d855f72b.7e86a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d55e670.1fa9f18",\r
+        "id": "32d70917.41b9b6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3845.75,\r
-        "y": 1190,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3842.566650390625,\r
+        "y": 1063,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "f4e2a19a.1a35e",\r
-                "f86044a9.f193d",\r
-                "4b4e2775.d6044",\r
-                "86690982.b14b6",\r
-                "21d875df.4e5d92",\r
-                "971d8a82.30a53"\r
+                "ab9c9477.87e1",\r
+                "16a44de.db79032",\r
+                "42cda8d6.66eab8",\r
+                "aab7a1d7.f682c8",\r
+                "43e0f21e.8328e4",\r
+                "173252a4.3c7835"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f86044a9.f193d",\r
+        "id": "16a44de.db79032",\r
         "type": "set",\r
         "name": "set attachment_param for OTN G",\r
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 4109.75,\r
-        "y": 1073,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4106.566650390625,\r
+        "y": 946,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "21d875df.4e5d92",\r
+        "id": "43e0f21e.8328e4",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4190.75,\r
-        "y": 1388,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4187.566650390625,\r
+        "y": 1261,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "cd1830a.9a25b5",\r
-                "5f7c3883.6456e"\r
+                "ecdb1dc3.601aa",\r
+                "9e4afd98.6cdb48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd1830a.9a25b5",\r
+        "id": "ecdb1dc3.601aa",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4500.25,\r
-        "y": 1357,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4497.066650390625,\r
+        "y": 1230,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "cf35e2b3.2c8468"\r
+                "111350dc.469227"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f7c3883.6456e",\r
+        "id": "9e4afd98.6cdb48",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4505.25,\r
-        "y": 1422,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4502.066650390625,\r
+        "y": 1295,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "b3a80e08.d037b"\r
+                "c6b74dac.622de"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf35e2b3.2c8468",\r
+        "id": "111350dc.469227",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 4676.25,\r
-        "y": 1357,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4673.066650390625,\r
+        "y": 1230,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3a80e08.d037b",\r
+        "id": "c6b74dac.622de",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4671.75,\r
-        "y": 1422,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4668.566650390625,\r
+        "y": 1295,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4b4e2775.d6044",\r
+        "id": "42cda8d6.66eab8",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 4047.75,\r
-        "y": 1121,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4044.566650390625,\r
+        "y": 994,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86690982.b14b6",\r
+        "id": "aab7a1d7.f682c8",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4073.75,\r
-        "y": 1238,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4070.566650390625,\r
+        "y": 1111,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "85fe6961.6a7908",\r
-                "3fb6fcbe.a3fa0c",\r
-                "89e44c19.cf1b38"\r
+                "fc77fdb3.27d7c",\r
+                "3d52c0ff.052c58",\r
+                "d66dde94.6fdfd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85fe6961.6a7908",\r
+        "id": "fc77fdb3.27d7c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4269.2501220703125,\r
-        "y": 1190,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4266.0667724609375,\r
+        "y": 1063,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "8a104557.0ad8d8"\r
+                "6a6dadc5.106a64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3fb6fcbe.a3fa0c",\r
+        "id": "3d52c0ff.052c58",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4261.2501220703125,\r
-        "y": 1245,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4258.0667724609375,\r
+        "y": 1118,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "42db739a.3307d4"\r
+                "6a18bc26.5dd68c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a104557.0ad8d8",\r
+        "id": "6a6dadc5.106a64",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4413.6324462890625,\r
-        "y": 1189.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4410.4490966796875,\r
+        "y": 1062.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "f760615b.c41c38"\r
+                "abd6aa97.319628"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f760615b.c41c38",\r
+        "id": "abd6aa97.319628",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4597.75,\r
-        "y": 1188,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4594.566650390625,\r
+        "y": 1061,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "142416ba.388749"\r
+                "d45837ad.7cfdd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "142416ba.388749",\r
+        "id": "d45837ad.7cfdd",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4792.75,\r
-        "y": 1188,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4789.566650390625,\r
+        "y": 1061,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ee80fb82.914478"\r
+                "56faad34.523464"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89e44c19.cf1b38",\r
+        "id": "d66dde94.6fdfd8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4266.2501220703125,\r
-        "y": 1302,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4263.0667724609375,\r
+        "y": 1175,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "190fd174.e420e7"\r
+                "da706f47.bc937"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "190fd174.e420e7",\r
+        "id": "da706f47.bc937",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4418.2501220703125,\r
-        "y": 1303,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4415.0667724609375,\r
+        "y": 1176,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "42db739a.3307d4",\r
+        "id": "6a18bc26.5dd68c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4429.2501220703125,\r
-        "y": 1246,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4426.0667724609375,\r
+        "y": 1119,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f4e2a19a.1a35e",\r
+        "id": "ab9c9477.87e1",\r
         "type": "set",\r
         "name": "set vpn-bindingG and connectivityG",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
         "comments": "",\r
-        "x": 4104.75,\r
-        "y": 1013,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4101.566650390625,\r
+        "y": 886,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee80fb82.914478",\r
+        "id": "56faad34.523464",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4995.75,\r
-        "y": 1192,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4992.566650390625,\r
+        "y": 1065,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "16f58788.f805f"\r
+                "30b949db.4c7a16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4337aa6a.e7854c",\r
+        "id": "df7b95f6.393d48",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5380.75,\r
-        "y": 1205,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5377.566650390625,\r
+        "y": 1078,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "d59e46ba.4f5ed8",\r
-                "51e7728a.8676fc",\r
-                "dbdd6c65.aefc38"\r
+                "166f182a.55dd48",\r
+                "e1871eda.62c8a8",\r
+                "b691673d.bc8c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16f58788.f805f",\r
+        "id": "30b949db.4c7a16",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5174.75,\r
-        "y": 1192,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5171.566650390625,\r
+        "y": 1065,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "925f4411.b3c5c",\r
-                "4337aa6a.e7854c"\r
+                "5671583d.41ed78",\r
+                "df7b95f6.393d48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "925f4411.b3c5c",\r
+        "id": "5671583d.41ed78",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainG id",\r
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 5410.75,\r
-        "y": 1153,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5407.566650390625,\r
+        "y": 1026,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d59e46ba.4f5ed8",\r
+        "id": "166f182a.55dd48",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5590.75,\r
-        "y": 1196,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5587.566650390625,\r
+        "y": 1069,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "9fb3d6ee.612538"\r
+                "61f2e54a.d8bfcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51e7728a.8676fc",\r
+        "id": "e1871eda.62c8a8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5582.75,\r
-        "y": 1251,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5579.566650390625,\r
+        "y": 1124,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "1c483cb2.44cb23"\r
+                "95391466.b0fdc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbdd6c65.aefc38",\r
+        "id": "b691673d.bc8c3",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5587.75,\r
-        "y": 1308,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5584.566650390625,\r
+        "y": 1181,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "c131e872.bad5c8"\r
+                "eaaeed8c.dbf45"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c131e872.bad5c8",\r
+        "id": "eaaeed8c.dbf45",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5739.75,\r
-        "y": 1309,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5736.566650390625,\r
+        "y": 1182,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c483cb2.44cb23",\r
+        "id": "95391466.b0fdc8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5750.75,\r
-        "y": 1254,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5747.566650390625,\r
+        "y": 1127,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9fb3d6ee.612538",\r
+        "id": "61f2e54a.d8bfcc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5735.13232421875,\r
-        "y": 1193.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5731.948974609375,\r
+        "y": 1066.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "e9716a08.a0ba08"\r
+                "573ef3d8.3e7cf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9716a08.a0ba08",\r
+        "id": "573ef3d8.3e7cf4",\r
         "type": "set",\r
         "name": "set controller domainG data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 5949.75,\r
-        "y": 1190,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5946.566650390625,\r
+        "y": 1063,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1f0320d.223f",\r
+        "id": "2171f884.ea7ea8",\r
         "type": "comment",\r
         "name": "both src and dst exist",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3723.75,\r
-        "y": 1131,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3720.566650390625,\r
+        "y": 1004,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db55a5db.cc9e2",\r
+        "id": "d6a4c941.f116b8",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2285.75,\r
-        "y": 858,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2282.566650390625,\r
+        "y": 731,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "8cfca669.4c31d",\r
-                "1cedd7fb.e18cd"\r
+                "49267234.da4bac",\r
+                "c034393e.41c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cedd7fb.e18cd",\r
+        "id": "c034393e.41c88",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2692.75,\r
-        "y": 876,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2689.566650390625,\r
+        "y": 749,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "91bf0188.93b52"\r
+                "bc6b2cdd.907e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cfca669.4c31d",\r
+        "id": "49267234.da4bac",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2692.75,\r
-        "y": 821,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2689.566650390625,\r
+        "y": 694,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "6ae8a7fa.83375"\r
+                "1c258f4d.ef4741"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ae8a7fa.83375",\r
+        "id": "1c258f4d.ef4741",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2848.75,\r
-        "y": 819,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2845.566650390625,\r
+        "y": 692,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "509b9ad8.503f2c",\r
-                "3dd6564a.788bea"\r
+                "43b4f3be.c07abc",\r
+                "60036337.4eba24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91bf0188.93b52",\r
+        "id": "bc6b2cdd.907e6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2825.75,\r
-        "y": 877,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2822.566650390625,\r
+        "y": 750,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "14b40144.c74357",\r
+        "id": "faef4429.aa2c8",\r
         "type": "set",\r
         "name": "unset tmp.aai.all-vpn-bindings",\r
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 1002.75,\r
-        "y": 293,\r
-        "z": "111f91bb.269a56",\r
+        "x": 999.566650390625,\r
+        "y": 166,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "470acf69.6a7218",\r
+        "id": "cda219ec.f988b",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
         "comments": "",\r
-        "x": 4119.75,\r
-        "y": 711,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4116.566650390625,\r
+        "y": 584,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "94ce35b5.84e9d",\r
+        "id": "2774aa91.aa9f06",\r
         "type": "set",\r
         "name": "set leaf-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 4179.75,\r
-        "y": 750,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4176.566650390625,\r
+        "y": 623,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8371652a.c1422",\r
+        "id": "54215ea2.f0c928",\r
         "type": "set",\r
         "name": "unset leaf-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",\r
         "comments": "",\r
-        "x": 995.75,\r
-        "y": 201,\r
-        "z": "111f91bb.269a56",\r
+        "x": 992.566650390625,\r
+        "y": 74,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "180e951c.adb823",\r
+        "id": "96b9a282.e630c",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
         "comments": "",\r
-        "x": 3531.75,\r
-        "y": 2227,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3528.566650390625,\r
+        "y": 2100,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b13189f3.5c00c",\r
+        "id": "2d0bf44f.d7a87c",\r
         "type": "set",\r
         "name": "set root-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 3587.75,\r
-        "y": 2276,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3584.566650390625,\r
+        "y": 2149,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "68b96268.5bf0d4",\r
+        "id": "5152a0e6.713128",\r
         "type": "set",\r
         "name": "unset root-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",\r
         "comments": "",\r
-        "x": 995.75,\r
-        "y": 240,\r
-        "z": "111f91bb.269a56",\r
+        "x": 992.566650390625,\r
+        "y": 113,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab74b4be.cbc48",\r
+        "id": "8ba173b9.e36f",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1026.75,\r
-        "y": 341,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1023.566650390625,\r
+        "y": 214,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "77984a30.f32474",\r
+        "id": "e82defb9.e02d8",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 236.75,\r
-        "y": 816,\r
-        "z": "111f91bb.269a56",\r
+        "x": 233.566650390625,\r
+        "y": 689,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "6b466955.39f7e8",\r
-                "ea72fa7a.37647",\r
-                "256cca7a.4ba78e"\r
+                "2d5a1d5b.838492",\r
+                "889991f3.032d8",\r
+                "b5db494f.57cef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b466955.39f7e8",\r
+        "id": "2d5a1d5b.838492",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 455.75,\r
-        "y": 754,\r
-        "z": "111f91bb.269a56",\r
+        "x": 452.566650390625,\r
+        "y": 627,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ff154227.b5783"\r
+                "438119f5.89426"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea72fa7a.37647",\r
+        "id": "889991f3.032d8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 465.240966796875,\r
-        "y": 796.5740356445312,\r
-        "z": "111f91bb.269a56",\r
+        "x": 462.0576171875,\r
+        "y": 669.5740356445312,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "256cca7a.4ba78e",\r
+        "id": "b5db494f.57cef8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 453.75,\r
-        "y": 843,\r
-        "z": "111f91bb.269a56",\r
+        "x": 450.566650390625,\r
+        "y": 716,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "9c1b438c.70f6e8"\r
+                "debce4b9.8571d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff154227.b5783",\r
+        "id": "438119f5.89426",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 652.75,\r
-        "y": 750,\r
-        "z": "111f91bb.269a56",\r
+        "x": 649.566650390625,\r
+        "y": 623,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "d19cd8ca.093408"\r
+                "e1b02bed.ab2ac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c1b438c.70f6e8",\r
+        "id": "debce4b9.8571d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 622.75,\r
-        "y": 844,\r
-        "z": "111f91bb.269a56",\r
+        "x": 619.566650390625,\r
+        "y": 717,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d19cd8ca.093408",\r
+        "id": "e1b02bed.ab2ac8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 876.08349609375,\r
-        "y": 749.9999389648438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 872.900146484375,\r
+        "y": 622.9999389648438,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ec3530b4.60943"\r
+                "e03ee0c1.da854"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec3530b4.60943",\r
+        "id": "e03ee0c1.da854",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1076.7501335144043,\r
-        "y": 751.000020980835,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1073.5667839050293,\r
+        "y": 624.000020980835,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "732a5938.51aee8"\r
+                "c4a6ee39.d82118"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "732a5938.51aee8",\r
+        "id": "c4a6ee39.d82118",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 206.75,\r
-        "y": 1013,\r
-        "z": "111f91bb.269a56",\r
+        "x": 203.566650390625,\r
+        "y": 886,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "23a8b591.9364c2",\r
-                "8c7cc41e.285ad",\r
-                "a093cec4.b44ed"\r
+                "7634ec98.e6038c",\r
+                "916099a4.9dccf",\r
+                "c850e0b6.e35a68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23a8b591.9364c2",\r
+        "id": "7634ec98.e6038c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 414.75,\r
-        "y": 977,\r
-        "z": "111f91bb.269a56",\r
+        "x": 411.566650390625,\r
+        "y": 850,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "9b9627ac.373dc8"\r
+                "33f1fe4a.c9d6f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c7cc41e.285ad",\r
+        "id": "916099a4.9dccf",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 415.240966796875,\r
-        "y": 1022.5740356445312,\r
-        "z": "111f91bb.269a56",\r
+        "x": 412.0576171875,\r
+        "y": 895.5740356445312,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a093cec4.b44ed",\r
+        "id": "c850e0b6.e35a68",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 412.75,\r
-        "y": 1066,\r
-        "z": "111f91bb.269a56",\r
+        "x": 409.566650390625,\r
+        "y": 939,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "26fe918.5a2edee"\r
+                "76c84cf.6c8b334"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26fe918.5a2edee",\r
+        "id": "76c84cf.6c8b334",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 581.75,\r
-        "y": 1067,\r
-        "z": "111f91bb.269a56",\r
+        "x": 578.566650390625,\r
+        "y": 940,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f6f3f7dd.ddd42",\r
+        "id": "d82baf7f.56b2f",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 553.75,\r
-        "y": 1561,\r
-        "z": "111f91bb.269a56",\r
+        "x": 550.566650390625,\r
+        "y": 1434,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "8744e477.6cb05"\r
+                "3c41a0c0.d2817"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8744e477.6cb05",\r
+        "id": "3c41a0c0.d2817",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 756.75,\r
-        "y": 1573,\r
-        "z": "111f91bb.269a56",\r
+        "x": 753.566650390625,\r
+        "y": 1446,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "9fc39c57.082728"\r
+                "24edffac.eaf52"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9fc39c57.082728",\r
+        "id": "24edffac.eaf52",\r
         "type": "outcome",\r
         "name": "UNI",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 922.75,\r
-        "y": 1570,\r
-        "z": "111f91bb.269a56",\r
+        "x": 919.566650390625,\r
+        "y": 1443,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "5d341323.92886c"\r
+                "8767ddb8.be5188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d341323.92886c",\r
+        "id": "8767ddb8.be5188",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1083.75,\r
-        "y": 1567,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1080.566650390625,\r
+        "y": 1440,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "878fc20b.33088",\r
-                "9a421f91.9b1b28",\r
-                "7916417b.dd4858",\r
-                "277d0a08.b51776",\r
-                "5d833ac3.a3e554",\r
-                "6bd95e1e.6c91d8"\r
+                "acad8b74.fa56d8",\r
+                "31574f1b.e35268",\r
+                "9a0e95d9.2f80c",\r
+                "559bb9d.67d2e48",\r
+                "d55a6f33.2c1388",\r
+                "bc764283.2e9fd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a421f91.9b1b28",\r
+        "id": "31574f1b.e35268",\r
         "type": "set",\r
         "name": "unset tmp.aai.uni",\r
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
         "comments": "",\r
-        "x": 1289.75,\r
-        "y": 1166.9999389648438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1286.566650390625,\r
+        "y": 1039.9999389648438,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "878fc20b.33088",\r
+        "id": "acad8b74.fa56d8",\r
         "type": "save",\r
         "name": "get uni from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1286.75,\r
-        "y": 1211.9999389648438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1283.566650390625,\r
+        "y": 1084.9999389648438,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "1277502d.c8e7a",\r
-                "3575cdbd.1f32e2",\r
-                "bad103b9.14ac5"\r
+                "1904c12b.d430cf",\r
+                "4ab95198.c6613",\r
+                "5a08d5cf.278d24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3575cdbd.1f32e2",\r
+        "id": "4ab95198.c6613",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1482.240966796875,\r
-        "y": 1185.5739135742188,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1479.0576171875,\r
+        "y": 1058.5739135742188,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "245198ca.86efd8"\r
+                "ba7aa021.45bdf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bad103b9.14ac5",\r
+        "id": "5a08d5cf.278d24",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1477.75,\r
-        "y": 1229.9998779296875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1474.566650390625,\r
+        "y": 1102.9998779296875,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "564cd01d.c60fe8"\r
+                "785f1788.92249"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "245198ca.86efd8",\r
+        "id": "ba7aa021.45bdf8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1644.8125,\r
-        "y": 1184.859619140625,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1641.629150390625,\r
+        "y": 1057.859619140625,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "564cd01d.c60fe8",\r
+        "id": "785f1788.92249",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1645.75,\r
-        "y": 1229.9998779296875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1642.566650390625,\r
+        "y": 1102.9998779296875,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "57d2d0ba.ac96f",\r
+        "id": "cc679883.b7f1b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1647.75,\r
-        "y": 1276.9998779296875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1644.566650390625,\r
+        "y": 1149.9998779296875,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1277502d.c8e7a",\r
+        "id": "1904c12b.d430cf",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1478.75,\r
-        "y": 1276.9998779296875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1475.566650390625,\r
+        "y": 1149.9998779296875,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "57d2d0ba.ac96f"\r
+                "cc679883.b7f1b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f14d939.b7d6d",\r
+        "id": "1a421455.86d86c",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
         "comments": "",\r
-        "x": 1260.75,\r
-        "y": 1798,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1257.566650390625,\r
+        "y": 1671,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7916417b.dd4858",\r
+        "id": "9a0e95d9.2f80c",\r
         "type": "set",\r
         "name": "set ethernet-srv-end-points-list array",\r
         "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1351.75,\r
-        "y": 1852,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1348.566650390625,\r
+        "y": 1725,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "780a0f58.bba71",\r
+        "id": "62fb7c08.30d35c",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
         "comments": "",\r
-        "x": 2028.25,\r
-        "y": 1265,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2025.066650390625,\r
+        "y": 1138,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "423abc5f.68ffa4",\r
+        "id": "b56049ef.636ab",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
         "comments": "",\r
-        "x": 2033.25,\r
-        "y": 1367,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2030.066650390625,\r
+        "y": 1240,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ae45b75.53fe1",\r
+        "id": "513cbd5b.994ffc",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 516.75,\r
-        "y": 1817,\r
-        "z": "111f91bb.269a56",\r
+        "x": 513.566650390625,\r
+        "y": 1690,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "a1c491a.b9e1cf"\r
+                "a14556b2.428608"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1c491a.b9e1cf",\r
+        "id": "a14556b2.428608",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 748.75,\r
-        "y": 1816,\r
-        "z": "111f91bb.269a56",\r
+        "x": 745.566650390625,\r
+        "y": 1689,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "c7d001fc.995ef"\r
+                "e5395881.3f95e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7d001fc.995ef",\r
+        "id": "e5395881.3f95e",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 960.75,\r
-        "y": 1817,\r
-        "z": "111f91bb.269a56",\r
+        "x": 957.566650390625,\r
+        "y": 1690,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "af8caf57.c80ff"\r
+                "ee871fda.29052"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af8caf57.c80ff",\r
+        "id": "ee871fda.29052",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 216.75,\r
-        "y": 1973,\r
-        "z": "111f91bb.269a56",\r
+        "x": 213.566650390625,\r
+        "y": 1846,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "dbb11610.758b08",\r
-                "e6442fee.44c628"\r
+                "d07450f8.7cfbd8",\r
+                "c80ac602.107b6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6442fee.44c628",\r
+        "id": "c80ac602.107b6",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 451.75,\r
-        "y": 1960,\r
-        "z": "111f91bb.269a56",\r
+        "x": 448.566650390625,\r
+        "y": 1833,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dbb11610.758b08",\r
+        "id": "d07450f8.7cfbd8",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 441.75,\r
-        "y": 2021,\r
-        "z": "111f91bb.269a56",\r
+        "x": 438.566650390625,\r
+        "y": 1894,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "afa88564.16a37",\r
-                "83950a7.2f6c078",\r
-                "12b1aba5.e7a0f4"\r
+                "3c9f89f1.b2d72e",\r
+                "7eb3712.5c8929",\r
+                "ab93aafa.12aed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83950a7.2f6c078",\r
+        "id": "7eb3712.5c8929",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 655.240966796875,\r
-        "y": 2005.5740356445312,\r
-        "z": "111f91bb.269a56",\r
+        "x": 652.0576171875,\r
+        "y": 1878.5740356445312,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ea85ca6d.e8d7e"\r
+                "abd0cdd.d934eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12b1aba5.e7a0f4",\r
+        "id": "ab93aafa.12aed",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 650.75,\r
-        "y": 2050,\r
-        "z": "111f91bb.269a56",\r
+        "x": 647.566650390625,\r
+        "y": 1923,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "eb678b0e.5293e8"\r
+                "b79502c7.acaad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "afa88564.16a37",\r
+        "id": "3c9f89f1.b2d72e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 652.75,\r
-        "y": 2110,\r
-        "z": "111f91bb.269a56",\r
+        "x": 649.566650390625,\r
+        "y": 1983,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "46f07676.1e063"\r
+                "509a448f.bd538c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea85ca6d.e8d7e",\r
+        "id": "abd0cdd.d934eb",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 817.8125,\r
-        "y": 2004.8597412109375,\r
-        "z": "111f91bb.269a56",\r
+        "x": 814.629150390625,\r
+        "y": 1877.8597412109375,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb678b0e.5293e8",\r
+        "id": "b79502c7.acaad8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 818.75,\r
-        "y": 2050,\r
-        "z": "111f91bb.269a56",\r
+        "x": 815.566650390625,\r
+        "y": 1923,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46f07676.1e063",\r
+        "id": "509a448f.bd538c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 821.75,\r
-        "y": 2109,\r
-        "z": "111f91bb.269a56",\r
+        "x": 818.566650390625,\r
+        "y": 1982,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "d6f04402.414508",\r
-                "ac4ce335.0555f"\r
+                "fd6f29b3.e5c99",\r
+                "f26de900.3c25f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42a4fda9.57619c",\r
+        "id": "3501776f.2dad38",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
         "comments": "",\r
-        "x": 241.75,\r
-        "y": 2611,\r
-        "z": "111f91bb.269a56",\r
+        "x": 238.566650390625,\r
+        "y": 2484,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3738a9bc.2f26e6",\r
+        "id": "ae9e098e.f50fb",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 363.75,\r
-        "y": 2668,\r
-        "z": "111f91bb.269a56",\r
+        "x": 360.566650390625,\r
+        "y": 2541,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ac81680a.65fae",\r
-                "96fc6628.148e78"\r
+                "be334cda.e25598",\r
+                "43d4ffc9.f69dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac81680a.65fae",\r
+        "id": "be334cda.e25598",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 676.25,\r
-        "y": 2645,\r
-        "z": "111f91bb.269a56",\r
+        "x": 673.066650390625,\r
+        "y": 2518,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "96fc6628.148e78",\r
+        "id": "43d4ffc9.f69dc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 680.25,\r
-        "y": 2685,\r
-        "z": "111f91bb.269a56",\r
+        "x": 677.066650390625,\r
+        "y": 2558,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "bf7ee9c0.419518"\r
+                "f38c34e4.0af87"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f03e95e.3ec198",\r
+        "id": "1415cbe4.3643cc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 856.25,\r
-        "y": 2649,\r
-        "z": "111f91bb.269a56",\r
+        "x": 853.066650390625,\r
+        "y": 2522,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bf7ee9c0.419518",\r
+        "id": "f38c34e4.0af87",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 871.75,\r
-        "y": 2703,\r
-        "z": "111f91bb.269a56",\r
+        "x": 868.566650390625,\r
+        "y": 2576,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "846842ab.33ca8",\r
-                "5e1c0ed5.c69c48",\r
-                "9a742833.7a10a8",\r
-                "feb8a80.2e93d58"\r
+                "38f98e31.2df7c2",\r
+                "2709d484.f39df4",\r
+                "708149ff.3b7b8",\r
+                "40e18201.7f31fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "214d3a40.5474be",\r
+        "id": "4fb2f1f7.44fff8",\r
         "type": "save",\r
         "name": "update vpn-binding resource (aka. OTN ) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1167.25,\r
-        "y": 2672,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1164.066650390625,\r
+        "y": 2545,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4243a8af.47f99",\r
+        "id": "8d799ed5.7c896",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 2634.25,\r
-        "y": 2023,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2631.066650390625,\r
+        "y": 1896,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "846842ab.33ca8",\r
+        "id": "38f98e31.2df7c2",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1129.25,\r
-        "y": 2714,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1126.066650390625,\r
+        "y": 2587,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "eb2c1071.d160d8",\r
+        "id": "421d14d0.8fa8dc",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",\r
         "comments": "",\r
-        "x": 1994.25,\r
-        "y": 1303,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1991.066650390625,\r
+        "y": 1176,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3c1d8397.66cfbc",\r
+        "id": "f196d566.5b274",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",\r
         "comments": "",\r
-        "x": 1995.25,\r
-        "y": 1407,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1992.066650390625,\r
+        "y": 1280,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9dbb6108.db3f08",\r
+        "id": "8954306d.3c458",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4288.75,\r
-        "y": 664,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4285.566650390625,\r
+        "y": 537,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "971d8a82.30a53",\r
+        "id": "173252a4.3c7835",\r
         "type": "save",\r
         "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4191.75,\r
-        "y": 1483,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4188.566650390625,\r
+        "y": 1356,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "72e7ea14.321c0c",\r
+        "id": "745353ea.a7c82c",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3685.75,\r
-        "y": 2155,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3682.566650390625,\r
+        "y": 2028,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9b9627ac.373dc8",\r
+        "id": "33f1fe4a.c9d6f2",\r
         "type": "switchNode",\r
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",\r
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 786.75,\r
-        "y": 963,\r
-        "z": "111f91bb.269a56",\r
+        "x": 783.566650390625,\r
+        "y": 836,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "20416bfa.abd944",\r
-                "3157f22c.bca4c6"\r
+                "c7ca69b2.c33e8",\r
+                "dbefa186.4d7f68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20416bfa.abd944",\r
+        "id": "c7ca69b2.c33e8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1149.75,\r
-        "y": 986,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1146.566650390625,\r
+        "y": 859,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "16371b2a.82f3f5"\r
+                "100503a.a2b7efc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3157f22c.bca4c6",\r
+        "id": "dbefa186.4d7f68",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1149.75,\r
-        "y": 935,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1146.566650390625,\r
+        "y": 808,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "7c942827.229d68"\r
+                "5ea3a0fe.77a12"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16371b2a.82f3f5",\r
+        "id": "100503a.a2b7efc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1305.75,\r
-        "y": 984,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1302.566650390625,\r
+        "y": 857,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "6516a515.9e0ed4"\r
+                "8fcbaf21.052888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c942827.229d68",\r
+        "id": "5ea3a0fe.77a12",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1282.75,\r
-        "y": 936,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1279.566650390625,\r
+        "y": 809,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d1721022.90ae5",\r
+        "id": "84203861.d12558",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 2042.75,\r
-        "y": 334,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2039.566650390625,\r
+        "y": 207,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1c10f72.410b08",\r
+        "id": "a43e9ba4.30fe8",\r
         "type": "set",\r
         "name": "set root-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 3584.75,\r
-        "y": 2315,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3581.566650390625,\r
+        "y": 2188,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7f10b67d.13cbf",\r
+        "id": "d41278c1.0e8268",\r
         "type": "set",\r
         "name": "set leaf-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 4174.75,\r
-        "y": 788,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4171.566650390625,\r
+        "y": 661,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "277d0a08.b51776",\r
+        "id": "559bb9d.67d2e48",\r
         "type": "set",\r
         "name": "set ethernet-srv-end-points-list array",\r
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1348.75,\r
-        "y": 1894,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1345.566650390625,\r
+        "y": 1767,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dbed9630.5fe208",\r
+        "id": "11998164.d0953f",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",\r
         "comments": "",\r
-        "x": 527.75,\r
-        "y": 1628,\r
-        "z": "111f91bb.269a56",\r
+        "x": 524.566650390625,\r
+        "y": 1501,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b8630526.556578",\r
+        "id": "3fbbcb97.f97994",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 558.75,\r
-        "y": 1668,\r
-        "z": "111f91bb.269a56",\r
+        "x": 555.566650390625,\r
+        "y": 1541,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d6f04402.414508",\r
+        "id": "fd6f29b3.e5c99",\r
         "type": "set",\r
         "name": "set otn-tunnels-name-list array",\r
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1106.75,\r
-        "y": 2076,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1103.566650390625,\r
+        "y": 1949,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac4ce335.0555f",\r
+        "id": "f26de900.3c25f8",\r
         "type": "set",\r
         "name": "set otn-tunnels-name-list array",\r
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1109.75,\r
-        "y": 2118,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1106.566650390625,\r
+        "y": 1991,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d6151d45.cfb988",\r
+        "id": "10dd7514.d835b3",\r
         "type": "set",\r
         "name": "unset otn-tunnels-name-list array",\r
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",\r
         "comments": "",\r
-        "x": 552.75,\r
-        "y": 1758,\r
-        "z": "111f91bb.269a56",\r
+        "x": 549.566650390625,\r
+        "y": 1631,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1b784f.6be4af8",\r
+        "id": "9cbc66e4.acef28",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
         "comments": "",\r
-        "x": 307.75,\r
-        "y": 2137,\r
-        "z": "111f91bb.269a56",\r
+        "x": 304.566650390625,\r
+        "y": 2010,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b54d5a69.762db",\r
+        "id": "2ee73d5.0d9a4c2",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 315.75,\r
-        "y": 2194,\r
-        "z": "111f91bb.269a56",\r
+        "x": 312.566650390625,\r
+        "y": 2067,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5d833ac3.a3e554",\r
+        "id": "d55a6f33.2c1388",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1326.75,\r
-        "y": 1743,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1323.566650390625,\r
+        "y": 1616,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "5ddf355f.54101c",\r
-                "1bdf6619.a36342"\r
+                "9cf30931.2c59c8",\r
+                "da4af294.46477"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1bdf6619.a36342",\r
+        "id": "da4af294.46477",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1549.75,\r
-        "y": 1698,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1546.566650390625,\r
+        "y": 1571,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "754506fa.d51aa8"\r
+                "66fe36a9.5f3c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ddf355f.54101c",\r
+        "id": "9cf30931.2c59c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1551.75,\r
-        "y": 1762,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1548.566650390625,\r
+        "y": 1635,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "68209615.eef37"\r
+                "204d74d2.252cac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "754506fa.d51aa8",\r
+        "id": "66fe36a9.5f3c98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1714.75,\r
-        "y": 1695,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1711.566650390625,\r
+        "y": 1568,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "714f4595.b88ec4"\r
+                "4c93c317.b90e14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68209615.eef37",\r
+        "id": "204d74d2.252cac",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 1713.75,\r
-        "y": 1758,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1710.566650390625,\r
+        "y": 1631,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "714f4595.b88ec4",\r
+        "id": "4c93c317.b90e14",\r
         "type": "set",\r
         "name": "set tmp.uni-node-id-short",\r
         "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
         "comments": "",\r
-        "x": 1934.75,\r
-        "y": 1709,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1931.566650390625,\r
+        "y": 1582,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1db1829e.06c1d5",\r
+        "id": "83593740.e4ddd",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1479.75,\r
-        "y": 2434,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1476.566650390625,\r
+        "y": 2307,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "2cbd7342.8e2ecc"\r
+                "bc0ef8cb.38db18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa138a5b.3e0008",\r
+        "id": "a1ab9a32.41426",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1864.75,\r
-        "y": 2447,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1861.566650390625,\r
+        "y": 2320,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "e14f1acf.1bcd",\r
-                "c2e19be7.fca29",\r
-                "775dbfec.d9501"\r
+                "eafaddf4.4288",\r
+                "a1c53fdc.e94408",\r
+                "b9669b07.a51828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cbd7342.8e2ecc",\r
+        "id": "bc0ef8cb.38db18",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1658.75,\r
-        "y": 2434,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1655.566650390625,\r
+        "y": 2307,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "6f327062.742838",\r
-                "fa138a5b.3e0008"\r
+                "2580690.f3eb118",\r
+                "a1ab9a32.41426"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f327062.742838",\r
+        "id": "2580690.f3eb118",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainConn id",\r
         "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 1894.75,\r
-        "y": 2395,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1891.566650390625,\r
+        "y": 2268,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e14f1acf.1bcd",\r
+        "id": "eafaddf4.4288",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2074.75,\r
-        "y": 2438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2071.566650390625,\r
+        "y": 2311,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "d0fc139e.1761"\r
+                "13cd3d1.ffcccc3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2e19be7.fca29",\r
+        "id": "a1c53fdc.e94408",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2066.75,\r
-        "y": 2493,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2063.566650390625,\r
+        "y": 2366,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "43b937df.ececd8"\r
+                "7da7ccee.d6972c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "775dbfec.d9501",\r
+        "id": "b9669b07.a51828",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2071.75,\r
-        "y": 2550,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2068.566650390625,\r
+        "y": 2423,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ac944679.99243"\r
+                "2930329b.329efe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac944679.99243",\r
+        "id": "2930329b.329efe",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2223.75,\r
-        "y": 2551,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2220.566650390625,\r
+        "y": 2424,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "43b937df.ececd8",\r
+        "id": "7da7ccee.d6972c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2234.75,\r
-        "y": 2496,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2231.566650390625,\r
+        "y": 2369,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d0fc139e.1761",\r
+        "id": "13cd3d1.ffcccc3",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2219.13232421875,\r
-        "y": 2435.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2215.948974609375,\r
+        "y": 2308.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "79bc2aa4.303284"\r
+                "febf727.ffe5c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79bc2aa4.303284",\r
+        "id": "febf727.ffe5c9",\r
         "type": "set",\r
         "name": "set controller domainConn data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 2433.75,\r
-        "y": 2432,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2430.566650390625,\r
+        "y": 2305,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d91a9773.8b97d8",\r
+        "id": "2716544d.2e4214",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 557.75,\r
-        "y": 2480,\r
-        "z": "111f91bb.269a56",\r
+        "x": 554.566650390625,\r
+        "y": 2353,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "fd5d97.57110a68",\r
-                "e3891e3f.2fa52",\r
-                "6282c457.966ab4"\r
+                "a2a1891d.4d5168",\r
+                "9cd28e00.2567d",\r
+                "a8c6a166.3984e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd5d97.57110a68",\r
+        "id": "a2a1891d.4d5168",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 753.2501220703125,\r
-        "y": 2432,\r
-        "z": "111f91bb.269a56",\r
+        "x": 750.0667724609375,\r
+        "y": 2305,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ee247bd7.5fac58"\r
+                "6cfc839f.58b674"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3891e3f.2fa52",\r
+        "id": "9cd28e00.2567d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 745.2501220703125,\r
-        "y": 2487,\r
-        "z": "111f91bb.269a56",\r
+        "x": 742.0667724609375,\r
+        "y": 2360,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "91fa570e.651ca8"\r
+                "7eb3886b.0a9b58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee247bd7.5fac58",\r
+        "id": "6cfc839f.58b674",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 897.6324462890625,\r
-        "y": 2431.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 894.4490966796875,\r
+        "y": 2304.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "ea7d04e7.1afcb8"\r
+                "cd8dae32.8ecf2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea7d04e7.1afcb8",\r
+        "id": "cd8dae32.8ecf2",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1081.75,\r
-        "y": 2430,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1078.566650390625,\r
+        "y": 2303,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "40c13bcd.4d6ac4"\r
+                "2f1b8cbe.c629a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40c13bcd.4d6ac4",\r
+        "id": "2f1b8cbe.c629a4",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1276.75,\r
-        "y": 2430,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1273.566650390625,\r
+        "y": 2303,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "1db1829e.06c1d5"\r
+                "83593740.e4ddd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6282c457.966ab4",\r
+        "id": "a8c6a166.3984e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 750.2501220703125,\r
-        "y": 2544,\r
-        "z": "111f91bb.269a56",\r
+        "x": 747.0667724609375,\r
+        "y": 2417,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "4979dd8d.1f5f3c"\r
+                "1a3f5fd3.7d7ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4979dd8d.1f5f3c",\r
+        "id": "1a3f5fd3.7d7ca8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 902.2501220703125,\r
-        "y": 2545,\r
-        "z": "111f91bb.269a56",\r
+        "x": 899.0667724609375,\r
+        "y": 2418,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "91fa570e.651ca8",\r
+        "id": "7eb3886b.0a9b58",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 913.2501220703125,\r
-        "y": 2488,\r
-        "z": "111f91bb.269a56",\r
+        "x": 910.0667724609375,\r
+        "y": 2361,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bd1da98.2130f58",\r
+        "id": "7c9a9ea1.e0f0b",\r
         "type": "set",\r
         "name": "set tmp.pnf-name-forUrl",\r
         "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 547.75,\r
-        "y": 2392,\r
-        "z": "111f91bb.269a56",\r
+        "x": 544.566650390625,\r
+        "y": 2265,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aa3bbb2.a6f0e48",\r
+        "id": "c2f9529c.5f262",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 292.75,\r
-        "y": 2523,\r
-        "z": "111f91bb.269a56",\r
+        "x": 289.566650390625,\r
+        "y": 2396,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "bd1da98.2130f58",\r
-                "d91a9773.8b97d8"\r
+                "7c9a9ea1.e0f0b",\r
+                "2716544d.2e4214"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b46d34a.40e874",\r
+        "id": "57a26dc0.1ee23c",\r
         "type": "comment",\r
         "name": "Temporary skipping this check - to support multiple instances in one slice",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1507.7166748046875,\r
-        "y": 340.8833312988281,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1504.5333251953125,\r
+        "y": 213.88333129882812,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1d9a3789.c423c",\r
+        "id": "7627d017.e729d8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 709.75,\r
-        "y": 563,\r
-        "z": "111f91bb.269a56",\r
+        "x": 706.566650390625,\r
+        "y": 436,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6516a515.9e0ed4",\r
+        "id": "40266792.930ff8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 269.25,\r
-        "y": 1532,\r
-        "z": "111f91bb.269a56",\r
+        "x": 266.066650390625,\r
+        "y": 1405,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "f6f3f7dd.ddd42",\r
-                "9ae45b75.53fe1",\r
-                "dbed9630.5fe208",\r
-                "b8630526.556578",\r
-                "42a4fda9.57619c",\r
-                "3738a9bc.2f26e6",\r
-                "d6151d45.cfb988",\r
-                "f1b784f.6be4af8",\r
-                "b54d5a69.762db",\r
-                "aa3bbb2.a6f0e48"\r
+                "d82baf7f.56b2f",\r
+                "513cbd5b.994ffc",\r
+                "11998164.d0953f",\r
+                "3fbbcb97.f97994",\r
+                "3501776f.2dad38",\r
+                "ae9e098e.f50fb",\r
+                "10dd7514.d835b3",\r
+                "9cbc66e4.acef28",\r
+                "2ee73d5.0d9a4c2",\r
+                "c2f9529c.5f262",\r
+                "cf851282.1a25c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bd95e1e.6c91d8",\r
+        "id": "bc764283.2e9fd8",\r
         "type": "switchNode",\r
         "name": "switch uni type",\r
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1299.75,\r
-        "y": 1370,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1296.566650390625,\r
+        "y": 1243,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "92533584.a5f61",\r
-                "18980475.16f3b4",\r
-                "ec63f877.0fd998",\r
-                "c1c9dc9a.d31ec"\r
+                "4133a5fe.bd0afc",\r
+                "cb7bb63e.a271e8",\r
+                "9b203a87.8531b",\r
+                "86f7d9c6.6cceb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92533584.a5f61",\r
+        "id": "4133a5fe.bd0afc",\r
         "type": "outcome",\r
         "name": "leaf",\r
         "xml": "<outcome value='leaf'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1464.75,\r
-        "y": 1352,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1461.566650390625,\r
+        "y": 1225,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "b00f22e0.6a5e"\r
+                "34effc93.508fc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18980475.16f3b4",\r
+        "id": "cb7bb63e.a271e8",\r
         "type": "outcome",\r
         "name": "root",\r
         "xml": "<outcome value='root'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1467.75,\r
-        "y": 1391,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1464.566650390625,\r
+        "y": 1264,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "52cb104.aabcaf"\r
+                "ceed6ba9.27c0d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1c9dc9a.d31ec",\r
+        "id": "86f7d9c6.6cceb8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1461.75,\r
-        "y": 1469,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1458.566650390625,\r
+        "y": 1342,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "4eaa272a.ec5048"\r
+                "971b0d55.da5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec63f877.0fd998",\r
+        "id": "9b203a87.8531b",\r
         "type": "outcome",\r
         "name": "root-secondary",\r
         "xml": "<outcome value='root-secondary'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1484.75,\r
-        "y": 1432,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1481.566650390625,\r
+        "y": 1305,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "e77dda82.efac78"\r
+                "f1880c82.5bc33"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb2c8aff.5902e",\r
+        "id": "f85814f1.078ec8",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
         "comments": "",\r
-        "x": 2030.75,\r
-        "y": 1465,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2027.566650390625,\r
+        "y": 1338,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8ca91d0.91a568",\r
+        "id": "17372550.7b802b",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",\r
         "comments": "",\r
-        "x": 1992.75,\r
-        "y": 1505,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1989.566650390625,\r
+        "y": 1378,\r
+        "z": "8603b63b.c1c358",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4eaa272a.ec5048",\r
+        "id": "971b0d55.da5e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1613.75,\r
-        "y": 1490,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1610.566650390625,\r
+        "y": 1363,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5e1c0ed5.c69c48",\r
+        "id": "2709d484.f39df4",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1203.3333740234375,\r
-        "y": 2789.3336181640625,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1200.1500244140625,\r
+        "y": 2662.3336181640625,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b00f22e0.6a5e",\r
+        "id": "34effc93.508fc4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1599.6666259765625,\r
-        "y": 1348.333251953125,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1596.4832763671875,\r
+        "y": 1221.333251953125,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "eb2c1071.d160d8"\r
+                "421d14d0.8fa8dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "52cb104.aabcaf",\r
+        "id": "ceed6ba9.27c0d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1601.6666259765625,\r
-        "y": 1386.333251953125,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1598.4832763671875,\r
+        "y": 1259.333251953125,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "3c1d8397.66cfbc"\r
+                "f196d566.5b274"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e77dda82.efac78",\r
+        "id": "f1880c82.5bc33",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1644.6666259765625,\r
-        "y": 1433.333251953125,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1641.4832763671875,\r
+        "y": 1306.333251953125,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             [\r
-                "c8ca91d0.91a568"\r
+                "17372550.7b802b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a742833.7a10a8",\r
+        "id": "708149ff.3b7b8",\r
         "type": "execute",\r
         "name": "execute RestconfDiscoveryNode establishSubscription",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1171.3333740234375,\r
-        "y": 2861.33349609375,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1168.1500244140625,\r
+        "y": 2734.33349609375,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "feb8a80.2e93d58",\r
+        "id": "40e18201.7f31fc",\r
         "type": "execute",\r
         "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1201.3333740234375,\r
-        "y": 2923.33349609375,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1198.1500244140625,\r
+        "y": 2796.33349609375,\r
+        "z": "8603b63b.c1c358",\r
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "cf851282.1a25c8",\r
+        "type": "set",\r
+        "name": "unset ethernet-srv-end-points-list",\r
+        "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
+        "comments": "",\r
+        "x": 591.566650390625,\r
+        "y": 1343.166748046875,\r
+        "z": "8603b63b.c1c358",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8fcbaf21.052888",\r
+        "type": "switchNode",\r
+        "name": "switch conn type",\r
+        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 132.56666564941406,\r
+        "y": 1054.1666259765625,\r
+        "z": "8603b63b.c1c358",\r
+        "wires": [\r
+            [\r
+                "5e5b0dce.955fb4",\r
+                "7fcb1378.0439ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7fcb1378.0439ec",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 317.566650390625,\r
+        "y": 1228.1666259765625,\r
+        "z": "8603b63b.c1c358",\r
+        "wires": [\r
+            [\r
+                "40266792.930ff8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5e5b0dce.955fb4",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 320.566650390625,\r
+        "y": 1183.1666259765625,\r
+        "z": "8603b63b.c1c358",\r
+        "wires": [\r
+            [\r
+                "40266792.930ff8"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
index 459577c..cd4962c 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "2b7da8b.17ed9d8",\r
+        "id": "94ab5931.1ae6d",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 248,\r
-        "y": 45,\r
-        "z": "ab59e982.86c81",\r
+        "x": 292.566650390625,\r
+        "y": 59.56666564941406,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "970691bb.ddc15"\r
+                "1c26c9e8.6ceaee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "970691bb.ddc15",\r
+        "id": "1c26c9e8.6ceaee",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,3073 +22,3073 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 532.2856903076172,\r
-        "y": 106.23810863494873,\r
-        "z": "ab59e982.86c81",\r
+        "x": 576.8523406982422,\r
+        "y": 120.8047742843628,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "60aef583.9235ac"\r
+                "23f5599a.c9cd86"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60aef583.9235ac",\r
+        "id": "23f5599a.c9cd86",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-F1",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 448.4285888671875,\r
-        "y": 184.00003051757812,\r
-        "z": "ab59e982.86c81",\r
+        "x": 492.9952392578125,\r
+        "y": 198.5666961669922,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "aea204d6.6a791"\r
+                "dc959d18.681ba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aea204d6.6a791",\r
+        "id": "dc959d18.681ba8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 182.238037109375,\r
-        "y": 687.6666870117188,\r
-        "z": "ab59e982.86c81",\r
+        "x": 226.8046875,\r
+        "y": 702.2333526611328,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "8d663f65.8f74e8",\r
-                "8c3bad0a.2ae1e",\r
-                "7334fea3.c843f",\r
-                "322c901e.38e458",\r
-                "363053e.3c7802c",\r
-                "6a3e2f90.eef6e",\r
-                "65e8fb60.0959f4",\r
-                "af2be5de.84caa8"\r
+                "3133ba0.df70946",\r
+                "a232054c.f7cde",\r
+                "cf7049ac.59d6b8",\r
+                "da9884fe.c1ab2",\r
+                "d00a834c.9393c8",\r
+                "e4a1c30c.a1f11",\r
+                "ed8a3e8e.eba718",\r
+                "5d4c8b88.6ea084"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d663f65.8f74e8",\r
+        "id": "3133ba0.df70946",\r
         "type": "set",\r
         "name": "set query_param",\r
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",\r
         "comments": "",\r
-        "x": 455,\r
-        "y": 642,\r
-        "z": "ab59e982.86c81",\r
+        "x": 499.566650390625,\r
+        "y": 656.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c3bad0a.2ae1e",\r
+        "id": "a232054c.f7cde",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 676,\r
-        "y": 710,\r
-        "z": "ab59e982.86c81",\r
+        "x": 720.566650390625,\r
+        "y": 724.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7334fea3.c843f",\r
+        "id": "cf7049ac.59d6b8",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 466,\r
-        "y": 756,\r
-        "z": "ab59e982.86c81",\r
+        "x": 510.566650390625,\r
+        "y": 770.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6a3e2f90.eef6e",\r
+        "id": "e4a1c30c.a1f11",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 659,\r
-        "y": 820,\r
-        "z": "ab59e982.86c81",\r
+        "x": 703.566650390625,\r
+        "y": 834.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "65e8fb60.0959f4",\r
+        "id": "ed8a3e8e.eba718",\r
         "type": "for",\r
         "name": "for vidx..tmp.otninfo_length[]",\r
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 751,\r
-        "y": 1199,\r
-        "z": "ab59e982.86c81",\r
+        "x": 795.566650390625,\r
+        "y": 1213.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "c2ebc420.8ee88"\r
+                "a0634476.d7e6f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2ebc420.8ee88",\r
+        "id": "a0634476.d7e6f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 972.9999694824219,\r
-        "y": 1211,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1017.5666198730469,\r
+        "y": 1225.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "2cc97555.3fad02",\r
-                "78caef7b.ab95f8",\r
-                "9c05f571.1eb168",\r
-                "eda8e4ad.92ee8",\r
-                "a27c8181.cf517",\r
-                "e500131.d3db37",\r
-                "b4245913.ae7bb",\r
-                "ac5e1496.5bc93",\r
-                "6299b58a.3a41b4",\r
-                "6cd61101.45105"\r
+                "aaab02fa.9f4d88",\r
+                "c83caaf9.d6f6",\r
+                "a09d3d16.a9628",\r
+                "38b6179d.185d98",\r
+                "6e9dd85.efe07a8",\r
+                "ef30d7fa.1abd9",\r
+                "ba078fb1.cbb95",\r
+                "95800647.4aa41",\r
+                "84e1fc7d.aa5158",\r
+                "4be74bfa.e8a9a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cc97555.3fad02",\r
+        "id": "aaab02fa.9f4d88",\r
         "type": "execute",\r
         "name": "execute UUID generator for vpn-binding $otnidx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648,\r
-        "y": 790,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1692.566650390625,\r
+        "y": 804.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "78caef7b.ab95f8",\r
+        "id": "c83caaf9.d6f6",\r
         "type": "switchNode",\r
         "name": "switch dstPort == NULL",\r
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1362,\r
-        "y": 880,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1406.566650390625,\r
+        "y": 894.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "b4cf3f6b.7b5288",\r
-                "f7c5eac6.57b338"\r
+                "a21a8c5c.c26b18",\r
+                "5ad886dd.89cfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4cf3f6b.7b5288",\r
+        "id": "a21a8c5c.c26b18",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1728,\r
-        "y": 841,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1772.566650390625,\r
+        "y": 855.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "7ef1427a.0fd4ac"\r
+                "492daa68.bf54bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7c5eac6.57b338",\r
+        "id": "5ad886dd.89cfc",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1729,\r
-        "y": 887,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1773.566650390625,\r
+        "y": 901.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "26ca350f.1d9a8a"\r
+                "5f6a6611.d2602"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ef1427a.0fd4ac",\r
+        "id": "492daa68.bf54bc",\r
         "type": "set",\r
         "name": "set access-provider-id and client-id",\r
         "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",\r
         "comments": "",\r
-        "x": 1942,\r
-        "y": 840,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1986.566650390625,\r
+        "y": 854.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "26ca350f.1d9a8a",\r
+        "id": "5f6a6611.d2602",\r
         "type": "set",\r
         "name": "set access-provider-id and client-id",\r
         "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",\r
         "comments": "",\r
-        "x": 1940,\r
-        "y": 885,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1984.566650390625,\r
+        "y": 899.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9c05f571.1eb168",\r
+        "id": "a09d3d16.a9628",\r
         "type": "set",\r
         "name": "set srcdstpnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 1538,\r
-        "y": 954,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1582.566650390625,\r
+        "y": 968.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eda8e4ad.92ee8",\r
+        "id": "38b6179d.185d98",\r
         "type": "get-resource",\r
         "name": "get-resource tmp.srcdstpnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1582,\r
-        "y": 1002,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1626.566650390625,\r
+        "y": 1016.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "79ecfb4e.255ea4",\r
-                "441f51df.f58208",\r
-                "204f27c3.a07c18"\r
+                "1e4fefc4.84dea",\r
+                "140ba84b.114188",\r
+                "5ac6d6d0.fa8f3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79ecfb4e.255ea4",\r
+        "id": "1e4fefc4.84dea",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1794.5,\r
-        "y": 949,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1839.066650390625,\r
+        "y": 963.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "eac32b1e.ec64f"\r
+                "c513ad5c.67a2a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "441f51df.f58208",\r
+        "id": "140ba84b.114188",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1806.5,\r
-        "y": 999,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1851.066650390625,\r
+        "y": 1013.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "4a1b3b6f.aa547c"\r
+                "56e61af8.fb0edc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "204f27c3.a07c18",\r
+        "id": "5ac6d6d0.fa8f3",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1797.5,\r
-        "y": 1054,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1842.066650390625,\r
+        "y": 1068.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "afa61155.e3e4f"\r
+                "5b77e98c.bb3518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "afa61155.e3e4f",\r
+        "id": "5b77e98c.bb3518",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1942.5,\r
-        "y": 1053,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1987.066650390625,\r
+        "y": 1067.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4a1b3b6f.aa547c",\r
+        "id": "56e61af8.fb0edc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1953.5,\r
-        "y": 996,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1998.066650390625,\r
+        "y": 1010.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eac32b1e.ec64f",\r
+        "id": "c513ad5c.67a2a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1919.8824462890625,\r
-        "y": 942.6556701660156,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1964.4490966796875,\r
+        "y": 957.2223358154297,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "3c0a3138.bdd26e"\r
+                "e866a3e1.053498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c0a3138.bdd26e",\r
+        "id": "e866a3e1.053498",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2081,\r
-        "y": 957,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2125.566650390625,\r
+        "y": 971.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "e187685d.0e36b8"\r
+                "5690d718.48c698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e187685d.0e36b8",\r
+        "id": "5690d718.48c698",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2276,\r
-        "y": 957,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2320.566650390625,\r
+        "y": 971.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "124aeba.98fab14"\r
+                "f99896f3.a9973"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48b536ea.5f9248",\r
+        "id": "804d49e5.886028",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2656,\r
-        "y": 953,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2700.566650390625,\r
+        "y": 967.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "c8495fb1.c63f38",\r
-                "9a0b489a.f82b3"\r
+                "ebd7bd5b.40a158",\r
+                "9cbfb486.1d485"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a0b489a.f82b3",\r
+        "id": "9cbfb486.1d485",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2864,\r
-        "y": 960,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2908.566650390625,\r
+        "y": 974.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "ff325fba.81a3f",\r
-                "5e11cb23.ea8384",\r
-                "435ef02b.e0a51"\r
+                "eb53f24.9c8df9",\r
+                "b699925f.52e788",\r
+                "177a0a75.4ffe3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8495fb1.c63f38",\r
+        "id": "ebd7bd5b.40a158",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainG id",\r
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 2894,\r
-        "y": 908,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2938.566650390625,\r
+        "y": 922.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff325fba.81a3f",\r
+        "id": "eb53f24.9c8df9",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3074,\r
-        "y": 951,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3118.566650390625,\r
+        "y": 965.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "3437139a.bfdd9c"\r
+                "664ce225.e11764"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e11cb23.ea8384",\r
+        "id": "b699925f.52e788",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3066,\r
-        "y": 1006,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3110.566650390625,\r
+        "y": 1020.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "db1340d4.287d2"\r
+                "c5f2fad1.bd663"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "435ef02b.e0a51",\r
+        "id": "177a0a75.4ffe3e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3071,\r
-        "y": 1063,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3115.566650390625,\r
+        "y": 1077.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "c8c2b440.36c658"\r
+                "f4a026e6.715c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8c2b440.36c658",\r
+        "id": "f4a026e6.715c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3223,\r
-        "y": 1064,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3267.566650390625,\r
+        "y": 1078.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db1340d4.287d2",\r
+        "id": "c5f2fad1.bd663",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3234,\r
-        "y": 1009,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3278.566650390625,\r
+        "y": 1023.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3437139a.bfdd9c",\r
+        "id": "664ce225.e11764",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3218.38232421875,\r
-        "y": 948.6556701660156,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3262.948974609375,\r
+        "y": 963.2223358154297,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "e7684b.19d5f7b8"\r
+                "a508abe9.f5813"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "124aeba.98fab14",\r
+        "id": "f99896f3.a9973",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2479,\r
-        "y": 961,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2523.566650390625,\r
+        "y": 975.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "48b536ea.5f9248"\r
+                "804d49e5.886028"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7684b.19d5f7b8",\r
+        "id": "a508abe9.f5813",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 3433,\r
-        "y": 945,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3477.566650390625,\r
+        "y": 959.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a27c8181.cf517",\r
+        "id": "6e9dd85.efe07a8",\r
         "type": "switchNode",\r
         "name": "switch dmnsidx == 0 (domainA)",\r
         "xml": "<switch test='`$otnidx == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1552,\r
-        "y": 1171,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1596.566650390625,\r
+        "y": 1185.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "55f451b.c21bcb",\r
-                "148790b5.591b8f"\r
+                "75774fa2.7a2cf",\r
+                "4436153e.9cd34c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55f451b.c21bcb",\r
+        "id": "75774fa2.7a2cf",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1753,\r
-        "y": 1169,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1797.566650390625,\r
+        "y": 1183.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "190bbee0.fdc3a1"\r
+                "36577996.f92cc6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4ef5898.fcc6d8",\r
+        "id": "b48623b8.fdb8a",\r
         "type": "set",\r
         "name": "set pce-src-node",\r
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",\r
         "comments": "",\r
-        "x": 2034,\r
-        "y": 1119,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2078.566650390625,\r
+        "y": 1133.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "82a35f7.532ff2",\r
+        "id": "54c1b7cf.fc463",\r
         "type": "switchNode",\r
         "name": "switch dmnsidx == last (domainB)",\r
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1970,\r
-        "y": 1220,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2014.566650390625,\r
+        "y": 1234.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "151d6bac.6b36ac",\r
-                "e7ce23ad.f63438"\r
+                "8183849e.8f8b9",\r
+                "edcb38ad.17a0a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "151d6bac.6b36ac",\r
+        "id": "8183849e.8f8b9",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2200,\r
-        "y": 1216,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2244.566650390625,\r
+        "y": 1230.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "1bd30175.73854f"\r
+                "eb1da6e2.d6cac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "148790b5.591b8f",\r
+        "id": "4436153e.9cd34c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1753,\r
-        "y": 1218,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1797.566650390625,\r
+        "y": 1232.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "82a35f7.532ff2"\r
+                "54c1b7cf.fc463"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7ce23ad.f63438",\r
+        "id": "edcb38ad.17a0a8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2201,\r
-        "y": 1262,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2245.566650390625,\r
+        "y": 1276.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "3d6b9433.a347bc"\r
+                "10a3f078.2aa84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d6b9433.a347bc",\r
+        "id": "10a3f078.2aa84",\r
         "type": "set",\r
         "name": "set attachment_param domain G",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 2415,\r
-        "y": 1262,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2459.566650390625,\r
+        "y": 1276.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "308a9211.a77236",\r
+        "id": "8c80417d.32f06",\r
         "type": "set",\r
         "name": "set attachment_param domain A",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 2089,\r
-        "y": 1166,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2133.566650390625,\r
+        "y": 1180.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "190bbee0.fdc3a1",\r
+        "id": "36577996.f92cc6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1877,\r
-        "y": 1160,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1921.566650390625,\r
+        "y": 1174.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "308a9211.a77236"\r
+                "8c80417d.32f06"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1bd30175.73854f",\r
+        "id": "eb1da6e2.d6cac",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2333,\r
-        "y": 1192,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2377.566650390625,\r
+        "y": 1206.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "9e7d0c9c.28922"\r
+                "4f91088c.aa2a9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9261980e.04515",\r
+        "id": "90fd9019.34d388",\r
         "type": "set",\r
         "name": "set pce-src-node",\r
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",\r
         "comments": "",\r
-        "x": 2489,\r
-        "y": 1208,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2533.566650390625,\r
+        "y": 1222.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9e7d0c9c.28922",\r
+        "id": "4f91088c.aa2a9",\r
         "type": "set",\r
         "name": "set attachment_param domain B",\r
         "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]`' />",\r
         "comments": "",\r
-        "x": 2537,\r
-        "y": 1160,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2581.566650390625,\r
+        "y": 1174.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "363053e.3c7802c",\r
+        "id": "d00a834c.9393c8",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "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",\r
         "comments": "",\r
-        "x": 423.99993896484375,\r
-        "y": 3813.000244140625,\r
-        "z": "ab59e982.86c81",\r
+        "x": 468.56658935546875,\r
+        "y": 3827.566909790039,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "322c901e.38e458",\r
+        "id": "da9884fe.c1ab2",\r
         "type": "set",\r
         "name": "set srcTtp OTN layer",\r
         "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 463,\r
-        "y": 898,\r
-        "z": "ab59e982.86c81",\r
+        "x": 507.566650390625,\r
+        "y": 912.5666656494141,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e500131.d3db37",\r
+        "id": "ef30d7fa.1abd9",\r
         "type": "set",\r
         "name": "set srcTtp+dstTtp pair",\r
         "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",\r
         "comments": "",\r
-        "x": 1528,\r
-        "y": 1251,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1572.566650390625,\r
+        "y": 1265.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac5e1496.5bc93",\r
+        "id": "95800647.4aa41",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1719.9999694824219,\r
-        "y": 1349,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1764.5666198730469,\r
+        "y": 1363.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b4245913.ae7bb",\r
+        "id": "ba078fb1.cbb95",\r
         "type": "set",\r
         "name": "set current-provider-id and current-cvlan-id",\r
         "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",\r
         "comments": "",\r
-        "x": 1592,\r
-        "y": 1302,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1636.566650390625,\r
+        "y": 1316.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6299b58a.3a41b4",\r
+        "id": "84e1fc7d.aa5158",\r
         "type": "switchNode",\r
         "name": "switch found-connectivity?",\r
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1401,\r
-        "y": 1503,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1445.566650390625,\r
+        "y": 1517.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "2ae1d3e2.c44d5c",\r
-                "7342444f.5f3ea4"\r
+                "e1b1a2e3.c8a22",\r
+                "a1f3f094.cf6868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ae1d3e2.c44d5c",\r
+        "id": "e1b1a2e3.c8a22",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1687,\r
-        "y": 2322,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1731.566650390625,\r
+        "y": 2336.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "27e9b59e.2795c2"\r
+                "877d2c40.229dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ba690d8.c6505",\r
+        "id": "9881a97f.aa45c",\r
         "type": "comment",\r
         "name": "call string.contains to check if the cache has srcTtpdstTtpPair",\r
         "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.",\r
         "comments": "",\r
-        "x": 2113,\r
-        "y": 2267,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2157.566650390625,\r
+        "y": 2281.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6f1cf403.6bf7dc",\r
+        "id": "8313a95b.4655",\r
         "type": "comment",\r
         "name": "create a new connectivity - (for dummy connectivity)",\r
         "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",\r
         "comments": "",\r
-        "x": 1979.9999694824219,\r
-        "y": 1465,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2024.5666198730469,\r
+        "y": 1479.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "570cc158.1e1d08",\r
+        "id": "298356b2.691352",\r
         "type": "save",\r
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2027,\r
-        "y": 1515,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2071.566650390625,\r
+        "y": 1529.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "e9e323ca.2e498"\r
+                "594dfec1.070b58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9e323ca.2e498",\r
+        "id": "594dfec1.070b58",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2315,\r
-        "y": 1516,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2359.566650390625,\r
+        "y": 1530.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "f5fef51a.3d04f8"\r
+                "20be2b7.b4b9054"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5fef51a.3d04f8",\r
+        "id": "20be2b7.b4b9054",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2498.5,\r
-        "y": 1514.25390625,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2543.066650390625,\r
+        "y": 1528.820571899414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "12f528da.eadc7f",\r
+        "id": "48aaf3f8.b9dde4",\r
         "type": "execute",\r
         "name": "execute string.contains srcTtpdstTtpPair",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2101,\r
-        "y": 2319,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2145.566650390625,\r
+        "y": 2333.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "8dd1e788.b5dd4",\r
-                "6a3cb15d.6fc0f8"\r
+                "5fc5edcc.a33e6c",\r
+                "1c8fc333.3d53cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8dd1e788.b5dd4",\r
+        "id": "5fc5edcc.a33e6c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2274,\r
-        "y": 2167,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2318.566650390625,\r
+        "y": 2181.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6a3cb15d.6fc0f8",\r
+        "id": "1c8fc333.3d53cd",\r
         "type": "outcomeFalse",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2306,\r
-        "y": 2426,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2350.566650390625,\r
+        "y": 2440.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "7ecab95b.cd5a18"\r
+                "7733ea37.676d94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82bc647c.2cf778",\r
+        "id": "94ea5f1c.00084",\r
         "type": "save",\r
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2713,\r
-        "y": 1957,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2757.566650390625,\r
+        "y": 1971.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "6754cf0f.d24068"\r
+                "ee79eb28.dfce98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6754cf0f.d24068",\r
+        "id": "ee79eb28.dfce98",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3017,\r
-        "y": 1954,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3061.566650390625,\r
+        "y": 1968.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "a854224c.98a058"\r
+                "cd827e2b.fca8e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a854224c.98a058",\r
+        "id": "cd827e2b.fca8e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3167.5,\r
-        "y": 1961.25390625,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3212.066650390625,\r
+        "y": 1975.820571899414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "87b5ce3b.8ef938",\r
+        "id": "6a2d9e1e.0984a",\r
         "type": "execute",\r
         "name": "execute UUID generator for connectivity domain otnidx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2007,\r
-        "y": 1570,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2051.566650390625,\r
+        "y": 1584.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6a69c0c.0beb14",\r
+        "id": "6f0be409.bf59b4",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1945,\r
-        "y": 1620,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1989.566650390625,\r
+        "y": 1634.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a4e3ab7a.498dc8",\r
+        "id": "f8e04437.c053b8",\r
         "type": "save",\r
         "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2046,\r
-        "y": 1665,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2090.566650390625,\r
+        "y": 1679.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "909dac00.1cdf4",\r
+        "id": "83b33842.f7a008",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "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`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2082,\r
-        "y": 1719,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2126.566650390625,\r
+        "y": 1733.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "30650806.4cf508",\r
+        "id": "665710a0.10b6d",\r
         "type": "save",\r
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2050,\r
-        "y": 1778,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2094.566650390625,\r
+        "y": 1792.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a06d70ba.206bf",\r
+        "id": "50815aa.2966624",\r
         "type": "comment",\r
         "name": "find middle-man's eth-srv-name",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1508,\r
-        "y": 1394,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1552.566650390625,\r
+        "y": 1408.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6cd61101.45105",\r
+        "id": "4be74bfa.e8a9a4",\r
         "type": "set",\r
         "name": "set prop.ethernet-service-name",\r
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",\r
         "comments": "",\r
-        "x": 1530,\r
-        "y": 1438,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1574.566650390625,\r
+        "y": 1452.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "78936cec.4008d4",\r
+        "id": "7bee4ebc.b72be8",\r
         "type": "save",\r
         "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2737,\r
-        "y": 2174,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2781.566650390625,\r
+        "y": 2188.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8c815ed6.372fa",\r
+        "id": "2dce7211.24f81e",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "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`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2768,\r
-        "y": 2213,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2812.566650390625,\r
+        "y": 2227.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "add6fed7.67e35",\r
+        "id": "90bd55a8.2fdfb",\r
         "type": "save",\r
         "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2739,\r
-        "y": 2286,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2783.566650390625,\r
+        "y": 2300.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8ad8acf7.e8e67",\r
+        "id": "7a94ba19.d3678c",\r
         "type": "comment",\r
         "name": "update the founded connectivity to have a new coupling-flag",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2709,\r
-        "y": 2002,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2753.566650390625,\r
+        "y": 2016.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ca2b693.c50608",\r
+        "id": "1f39716d.08bb37",\r
         "type": "set",\r
         "name": "set newFlag",\r
         "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2595,\r
-        "y": 2041,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2639.566650390625,\r
+        "y": 2055.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f51b095.94fd08",\r
+        "id": "966d5b58.b138c",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2659,\r
-        "y": 2086,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2703.566650390625,\r
+        "y": 2100.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "58d04196.f5778",\r
+        "id": "3ca218f1.e24728",\r
         "type": "comment",\r
         "name": "the following two relationships should have already been there; if not => error",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2751,\r
-        "y": 2136,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2795.566650390625,\r
+        "y": 2150.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "832e8c75.f85478",\r
+        "id": "533f0d90.da6154",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1737,\r
-        "y": 1503,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1781.566650390625,\r
+        "y": 1517.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "570cc158.1e1d08",\r
-                "87b5ce3b.8ef938",\r
-                "6a69c0c.0beb14",\r
-                "a4e3ab7a.498dc8",\r
-                "909dac00.1cdf4",\r
-                "30650806.4cf508"\r
+                "298356b2.691352",\r
+                "6a2d9e1e.0984a",\r
+                "6f0be409.bf59b4",\r
+                "f8e04437.c053b8",\r
+                "83b33842.f7a008",\r
+                "665710a0.10b6d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7342444f.5f3ea4",\r
+        "id": "a1f3f094.cf6868",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1599,\r
-        "y": 1499,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1643.566650390625,\r
+        "y": 1513.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "832e8c75.f85478"\r
+                "533f0d90.da6154"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27e9b59e.2795c2",\r
+        "id": "877d2c40.229dc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2397,\r
-        "y": 1966,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2441.566650390625,\r
+        "y": 1980.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "82bc647c.2cf778",\r
-                "8ca2b693.c50608",\r
-                "9f51b095.94fd08",\r
-                "add6fed7.67e35"\r
+                "94ea5f1c.00084",\r
+                "1f39716d.08bb37",\r
+                "966d5b58.b138c",\r
+                "90bd55a8.2fdfb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ddcfbda0.672cc",\r
+        "id": "921c2635.2657",\r
         "type": "comment",\r
         "name": "loop through the relationships of this founded connectivity, then",\r
         "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",\r
         "comments": "",\r
-        "x": 2402,\r
-        "y": 2391,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2446.566650390625,\r
+        "y": 2405.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86c04fbf.f3fdf8",\r
+        "id": "2a3dc4da.d825f4",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2744,\r
-        "y": 2427,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2788.566650390625,\r
+        "y": 2441.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "d9d55075.06cb88"\r
+                "736b385a.35da7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9d55075.06cb88",\r
+        "id": "736b385a.35da7",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2956,\r
-        "y": 2425,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3000.566650390625,\r
+        "y": 2439.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "b5809f3c.79c17"\r
+                "e66ec218.e79bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5809f3c.79c17",\r
+        "id": "e66ec218.e79bc",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3140,\r
-        "y": 2423,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3184.566650390625,\r
+        "y": 2437.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "17f341d4.56b9ee"\r
+                "8c204db5.df1ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17f341d4.56b9ee",\r
+        "id": "8c204db5.df1ea",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3319,\r
-        "y": 2428,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3363.566650390625,\r
+        "y": 2442.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "77bff99b.403968",\r
-                "813820e1.d9db2"\r
+                "750b8345.e6107c",\r
+                "b2411873.31b798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "813820e1.d9db2",\r
+        "id": "b2411873.31b798",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 3536,\r
-        "y": 2359,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3580.566650390625,\r
+        "y": 2373.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "77bff99b.403968",\r
+        "id": "750b8345.e6107c",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3529,\r
-        "y": 2445,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3573.566650390625,\r
+        "y": 2459.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "574e7a35.7acb64",\r
-                "72ff429d.0f84dc",\r
-                "d88724e6.b16bd8"\r
+                "bdf485ca.827e58",\r
+                "ed90443b.6fe53",\r
+                "a94ce9b.8c46898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72ff429d.0f84dc",\r
+        "id": "ed90443b.6fe53",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3742.490966796875,\r
-        "y": 2429.5740356445312,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3787.0576171875,\r
+        "y": 2444.1407012939453,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "47df6bef.c00ec4"\r
+                "1ae663bf.60e5d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47df6bef.c00ec4",\r
+        "id": "1ae663bf.60e5d4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3905.0625,\r
-        "y": 2428.8597412109375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3949.629150390625,\r
+        "y": 2443.4264068603516,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "25a6a90d.740966",\r
+        "id": "4b566804.b29878",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3906,\r
-        "y": 2474,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3950.566650390625,\r
+        "y": 2488.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d88724e6.b16bd8",\r
+        "id": "a94ce9b.8c46898",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3738,\r
-        "y": 2474,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3782.566650390625,\r
+        "y": 2488.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "25a6a90d.740966"\r
+                "4b566804.b29878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "574e7a35.7acb64",\r
+        "id": "bdf485ca.827e58",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3740,\r
-        "y": 2534,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3784.566650390625,\r
+        "y": 2548.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "fafaf735.33502"\r
+                "e92643e6.dea4d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fafaf735.33502",\r
+        "id": "e92643e6.dea4d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3909,\r
-        "y": 2533,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3953.566650390625,\r
+        "y": 2547.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "dbd3b6f8.ffc688"\r
+                "8f8a5cb3.af8a3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ecab95b.cd5a18",\r
+        "id": "7733ea37.676d94",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2533,\r
-        "y": 2425,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2577.566650390625,\r
+        "y": 2439.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "86c04fbf.f3fdf8",\r
-                "3d93e24d.201056",\r
-                "18210d7a.52f32b"\r
+                "2a3dc4da.d825f4",\r
+                "9b2ffd1b.3a96e",\r
+                "6fbcac88.0e9a54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbd3b6f8.ffc688",\r
+        "id": "8f8a5cb3.af8a3",\r
         "type": "switchNode",\r
         "name": "switch srcTtp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4108,\r
-        "y": 2534,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4152.566650390625,\r
+        "y": 2548.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "f13865e2.850a98"\r
+                "bc9f47cc.0b96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f13865e2.850a98",\r
+        "id": "bc9f47cc.0b96",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4271,\r
-        "y": 2532,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4315.566650390625,\r
+        "y": 2546.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "9cbb1279.26e6c"\r
+                "566fa06e.e1e238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cbb1279.26e6c",\r
+        "id": "566fa06e.e1e238",\r
         "type": "switchNode",\r
         "name": "switch dstTtp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4452,\r
-        "y": 2532,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4496.566650390625,\r
+        "y": 2546.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "9f041833.a96178"\r
+                "f4daf0bd.af9d9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f041833.a96178",\r
+        "id": "f4daf0bd.af9d9",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4615,\r
-        "y": 2530,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4659.566650390625,\r
+        "y": 2544.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "7a99f43e.47072c"\r
+                "c0c49b50.2a7748"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d307538.ff5302",\r
+        "id": "562992d6.b870dc",\r
         "type": "set",\r
         "name": "set tmp.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",\r
         "comments": "",\r
-        "x": 4972,\r
-        "y": 2537,\r
-        "z": "ab59e982.86c81",\r
+        "x": 5016.566650390625,\r
+        "y": 2551.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a99f43e.47072c",\r
+        "id": "c0c49b50.2a7748",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4754,\r
-        "y": 2529,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4798.566650390625,\r
+        "y": 2543.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "3d307538.ff5302",\r
-                "9c163e19.5e2778"\r
+                "562992d6.b870dc",\r
+                "10659fb.a744fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c163e19.5e2778",\r
+        "id": "10659fb.a744fe",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4918,\r
-        "y": 2581,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4962.566650390625,\r
+        "y": 2595.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d93e24d.201056",\r
+        "id": "9b2ffd1b.3a96e",\r
         "type": "set",\r
         "name": "unset tmp.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 2754,\r
-        "y": 2388,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2798.566650390625,\r
+        "y": 2402.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad919177.04496",\r
+        "id": "9d592730.4455b8",\r
         "type": "comment",\r
         "name": "increase the bw of the-vpn-binding and change status to modified",\r
         "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
         "comments": "",\r
-        "x": 2843,\r
-        "y": 2562,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2887.566650390625,\r
+        "y": 2576.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "18210d7a.52f32b",\r
+        "id": "6fbcac88.0e9a54",\r
         "type": "save",\r
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2813,\r
-        "y": 2622,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2857.566650390625,\r
+        "y": 2636.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "af2be5de.84caa8",\r
+        "id": "5d4c8b88.6ea084",\r
         "type": "switchNode",\r
         "name": "switch otninfoProtect exists",\r
         "xml": "<switch test=\"`$tmp.otninfoProtect_length > 0`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 579.1166381835938,\r
-        "y": 2488,\r
-        "z": "ab59e982.86c81",\r
+        "x": 623.6832885742188,\r
+        "y": 2502.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "bdb88dff.a2cfc8"\r
+                "b304b119.fc6c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdb88dff.a2cfc8",\r
+        "id": "b304b119.fc6c6",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 800.1166381835938,\r
-        "y": 2489,\r
-        "z": "ab59e982.86c81",\r
+        "x": 844.6832885742188,\r
+        "y": 2503.566665649414,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "62f58207.69b144"\r
+                "929a93b0.fb26e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4da32200.1a505",\r
+        "id": "1365d05a.43ccb8",\r
         "type": "for",\r
         "name": "for vidx..tmp.otninfoProtect_length[]",\r
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfoProtect_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 615.6666870117188,\r
-        "y": 3269.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 660.2333374023438,\r
+        "y": 3284.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "78d123a7.ebdd04"\r
+                "d491584d.33cd28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78d123a7.ebdd04",\r
+        "id": "d491584d.33cd28",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 875.6666564941406,\r
-        "y": 3262.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 920.2333068847656,\r
+        "y": 3277.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "655b0cf9.434f14",\r
-                "2cbd342f.008e4c",\r
-                "af443653.16e2a",\r
-                "b4328c41.7c5e68",\r
-                "54752c5a.7588d4",\r
-                "88c79ac5.392298",\r
-                "f442f477.1b9ac",\r
-                "1b1a37df.8ffb38",\r
-                "40d5cce.138f1b4",\r
-                "17ca39fd.1576de"\r
+                "252a570f.f396c8",\r
+                "f0403523.cecec",\r
+                "53ad6d75.3e9854",\r
+                "61d4cb78.58331c",\r
+                "d81f3e39.a99398",\r
+                "57f2e473.517f54",\r
+                "c1b2a740.d37fa",\r
+                "34621460.796344",\r
+                "5ed2002c.80ebf8",\r
+                "6dfdf88f.4bb6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cbd342f.008e4c",\r
+        "id": "f0403523.cecec",\r
         "type": "switchNode",\r
         "name": "switch dstPort == NULL",\r
         "xml": "<switch test=\"`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1264.6666870117188,\r
-        "y": 2931.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1309.2333374023438,\r
+        "y": 2946.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "390f0f63.f5713",\r
-                "a481fb54.252848"\r
+                "a19e39b9.f8da1",\r
+                "f567fdff.bdc4a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a481fb54.252848",\r
+        "id": "f567fdff.bdc4a8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1631.6666870117188,\r
-        "y": 2938.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1676.2333374023438,\r
+        "y": 2953.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "accd9965.551cc"\r
+                "4918f2b6.cf40ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "accd9965.551cc",\r
+        "id": "4918f2b6.cf40ac",\r
         "type": "set",\r
         "name": "set access-provider-id and client-id",\r
         "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",\r
         "comments": "",\r
-        "x": 1842.6666870117188,\r
-        "y": 2936.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1887.2333374023438,\r
+        "y": 2951.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af443653.16e2a",\r
+        "id": "53ad6d75.3e9854",\r
         "type": "set",\r
         "name": "set srcdstpnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 1440.6666870117188,\r
-        "y": 3005.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1485.2333374023438,\r
+        "y": 3020.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4328c41.7c5e68",\r
+        "id": "61d4cb78.58331c",\r
         "type": "get-resource",\r
         "name": "get-resource tmp.srcdstpnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1484.6666870117188,\r
-        "y": 3053.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1529.2333374023438,\r
+        "y": 3068.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "2ab1cad2.cc8df6",\r
-                "95061116.66953",\r
-                "d118596c.c8a1b"\r
+                "c8e35acd.0cd338",\r
+                "1a3bc3e9.de0b6c",\r
+                "d9c66705.f174c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ab1cad2.cc8df6",\r
+        "id": "c8e35acd.0cd338",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1697.1666870117188,\r
-        "y": 3000.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1741.7333374023438,\r
+        "y": 3015.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "9a46b094.250a1"\r
+                "b0542ad9.f9bdf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95061116.66953",\r
+        "id": "1a3bc3e9.de0b6c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1709.1666870117188,\r
-        "y": 3050.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1753.7333374023438,\r
+        "y": 3065.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "a8bbbf3c.490288"\r
+                "6126bc5c.e48684"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d118596c.c8a1b",\r
+        "id": "d9c66705.f174c8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1700.1666870117188,\r
-        "y": 3105.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1744.7333374023438,\r
+        "y": 3120.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "c4cf4a50.357dd"\r
+                "bc3263f3.ac82e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4cf4a50.357dd",\r
+        "id": "bc3263f3.ac82e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1845.1666870117188,\r
-        "y": 3104.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1889.7333374023438,\r
+        "y": 3119.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a8bbbf3c.490288",\r
+        "id": "6126bc5c.e48684",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1856.1666870117188,\r
-        "y": 3047.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1900.7333374023438,\r
+        "y": 3062.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9a46b094.250a1",\r
+        "id": "b0542ad9.f9bdf8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1822.5491333007812,\r
-        "y": 2994.5555725097656,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1867.1157836914062,\r
+        "y": 3009.1222381591797,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "8c15c7c0.68b978"\r
+                "fcdf9d8b.4643d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c15c7c0.68b978",\r
+        "id": "fcdf9d8b.4643d",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1983.6666870117188,\r
-        "y": 3008.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2028.2333374023438,\r
+        "y": 3023.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "a8c602fe.1de83"\r
+                "d8f6f412.7d192"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8c602fe.1de83",\r
+        "id": "d8f6f412.7d192",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2178.6666870117188,\r
-        "y": 3008.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2223.2333374023438,\r
+        "y": 3023.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "92605acf.b6eae"\r
+                "513cd183.70a36"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d5fc5da.8209c2",\r
+        "id": "16c3d135.367537",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2558.6666870117188,\r
-        "y": 3004.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2603.2333374023438,\r
+        "y": 3019.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "f1e62050.aa9b48",\r
-                "142adcaa.53768b"\r
+                "8f09a3ce.bb8bc8",\r
+                "42328e66.9a179"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "142adcaa.53768b",\r
+        "id": "42328e66.9a179",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2766.6666870117188,\r
-        "y": 3011.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2811.2333374023438,\r
+        "y": 3026.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "b0f57546.a572f8",\r
-                "f4d8ee18.503d6",\r
-                "6cf185fa.032e7c"\r
+                "2a95e8b.71c7818",\r
+                "8cd4441d.84eb48",\r
+                "2f9a0731.3058d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1e62050.aa9b48",\r
+        "id": "8f09a3ce.bb8bc8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainG id",\r
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 2796.6666870117188,\r
-        "y": 2959.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2841.2333374023438,\r
+        "y": 2974.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b0f57546.a572f8",\r
+        "id": "2a95e8b.71c7818",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2976.6666870117188,\r
-        "y": 3002.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3021.2333374023438,\r
+        "y": 3017.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "8af042ca.abce2"\r
+                "bb0632bc.6bdea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4d8ee18.503d6",\r
+        "id": "8cd4441d.84eb48",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2968.6666870117188,\r
-        "y": 3057.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3013.2333374023438,\r
+        "y": 3072.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "14e1063f.bcaa12"\r
+                "fee906e6.a31e28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cf185fa.032e7c",\r
+        "id": "2f9a0731.3058d8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2973.6666870117188,\r
-        "y": 3114.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3018.2333374023438,\r
+        "y": 3129.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "88d269ff.2a4e78"\r
+                "b7732316.bbeb1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88d269ff.2a4e78",\r
+        "id": "b7732316.bbeb1",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3125.6666870117188,\r
-        "y": 3115.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3170.2333374023438,\r
+        "y": 3130.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14e1063f.bcaa12",\r
+        "id": "fee906e6.a31e28",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3136.6666870117188,\r
-        "y": 3060.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3181.2333374023438,\r
+        "y": 3075.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8af042ca.abce2",\r
+        "id": "bb0632bc.6bdea8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3121.0490112304688,\r
-        "y": 3000.5555725097656,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3165.6156616210938,\r
+        "y": 3015.1222381591797,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "6ee06c7f.e87634"\r
+                "f496005b.73025"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92605acf.b6eae",\r
+        "id": "513cd183.70a36",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2381.6666870117188,\r
-        "y": 3012.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2426.2333374023438,\r
+        "y": 3027.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "3d5fc5da.8209c2"\r
+                "16c3d135.367537"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ee06c7f.e87634",\r
+        "id": "f496005b.73025",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 3335.6666870117188,\r
-        "y": 2996.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3380.2333374023438,\r
+        "y": 3011.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "54752c5a.7588d4",\r
+        "id": "d81f3e39.a99398",\r
         "type": "switchNode",\r
         "name": "switch dmnsidx == 0 (domainA)",\r
         "xml": "<switch test='`$otnidx == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1454.6666870117188,\r
-        "y": 3222.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1499.2333374023438,\r
+        "y": 3237.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "a23826d9.6cbf8",\r
-                "ca79965c.c43c5"\r
+                "f53e378b.14151",\r
+                "e638c491.631368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a23826d9.6cbf8",\r
+        "id": "f53e378b.14151",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1655.6666870117188,\r
-        "y": 3220.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1700.2333374023438,\r
+        "y": 3235.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "1188399c.8e417e"\r
+                "7fd6322b.5362bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f0d00e5.7b1628",\r
+        "id": "f8356e69.4561c",\r
         "type": "set",\r
         "name": "set pce-src-node",\r
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",\r
         "comments": "",\r
-        "x": 1936.6666870117188,\r
-        "y": 3170.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1981.2333374023438,\r
+        "y": 3185.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f4e7389.48dcac8",\r
+        "id": "4191bf2c.16bd58",\r
         "type": "switchNode",\r
         "name": "switch dmnsidx == last (domainC)",\r
         "xml": "<switch test='`$otnidx == $tmp.otninfoProtect_length - 1`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1872.6666870117188,\r
-        "y": 3271.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1917.2333374023438,\r
+        "y": 3286.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "1eeda518.bbd863",\r
-                "25bb7e68.eed552"\r
+                "93d13951.14dd18",\r
+                "fa75dc08.2eaf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1eeda518.bbd863",\r
+        "id": "93d13951.14dd18",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2102.6666870117188,\r
-        "y": 3267.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2147.2333374023438,\r
+        "y": 3282.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "19cc5bd6.d13bb4"\r
+                "8d4bef0b.6a0fe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca79965c.c43c5",\r
+        "id": "e638c491.631368",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1655.6666870117188,\r
-        "y": 3269.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1700.2333374023438,\r
+        "y": 3284.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "f4e7389.48dcac8"\r
+                "4191bf2c.16bd58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25bb7e68.eed552",\r
+        "id": "fa75dc08.2eaf8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2103.6666870117188,\r
-        "y": 3313.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2148.2333374023438,\r
+        "y": 3328.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "ff457a93.22142"\r
+                "5bb88da7.4d8694"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff457a93.22142",\r
+        "id": "5bb88da7.4d8694",\r
         "type": "set",\r
         "name": "set attachment_param domain G",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 2317.6666870117188,\r
-        "y": 3313.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2362.2333374023438,\r
+        "y": 3328.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a5bfc25b.24a798",\r
+        "id": "6729c928.c3b6c",\r
         "type": "set",\r
         "name": "set attachment_param domain A",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 1991.6666870117188,\r
-        "y": 3217.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2036.2333374023438,\r
+        "y": 3232.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1188399c.8e417e",\r
+        "id": "7fd6322b.5362bc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1779.6666870117188,\r
-        "y": 3211.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1824.2333374023438,\r
+        "y": 3226.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "a5bfc25b.24a798"\r
+                "6729c928.c3b6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19cc5bd6.d13bb4",\r
+        "id": "8d4bef0b.6a0fe8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2235.6666870117188,\r
-        "y": 3243.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2280.2333374023438,\r
+        "y": 3258.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "ecfd7b03.8cb46"\r
+                "e3feca80.0e5828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9df9d2f.f6b57",\r
+        "id": "e95f7eb5.2af0b8",\r
         "type": "set",\r
         "name": "set pce-src-node",\r
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",\r
         "comments": "",\r
-        "x": 2391.6666870117188,\r
-        "y": 3259.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2436.2333374023438,\r
+        "y": 3274.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ecfd7b03.8cb46",\r
+        "id": "e3feca80.0e5828",\r
         "type": "set",\r
         "name": "set attachment_param domain C",\r
         "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]`' />",\r
         "comments": "",\r
-        "x": 2439.6666870117188,\r
-        "y": 3211.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2484.2333374023438,\r
+        "y": 3226.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "88c79ac5.392298",\r
+        "id": "57f2e473.517f54",\r
         "type": "set",\r
         "name": "set srcTtp+dstTtp pair",\r
         "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",\r
         "comments": "",\r
-        "x": 1430.6666870117188,\r
-        "y": 3302.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1475.2333374023438,\r
+        "y": 3317.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b1a37df.8ffb38",\r
+        "id": "34621460.796344",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1622.6666564941406,\r
-        "y": 3400.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1667.2333068847656,\r
+        "y": 3415.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f442f477.1b9ac",\r
+        "id": "c1b2a740.d37fa",\r
         "type": "set",\r
         "name": "set current-provider-id and current-cvlan-id",\r
         "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",\r
         "comments": "",\r
-        "x": 1494.6666870117188,\r
-        "y": 3353.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1539.2333374023438,\r
+        "y": 3368.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40d5cce.138f1b4",\r
+        "id": "5ed2002c.80ebf8",\r
         "type": "switchNode",\r
         "name": "switch found-connectivity?",\r
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1303.6666870117188,\r
-        "y": 3554.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1348.2333374023438,\r
+        "y": 3569.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "e841833f.a5b018",\r
-                "1d9dc789.fabfa"\r
+                "3ba1da7b.60657e",\r
+                "5bde363c.523c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e841833f.a5b018",\r
+        "id": "3ba1da7b.60657e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1589.6666870117188,\r
-        "y": 4373.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1634.2333374023438,\r
+        "y": 4388.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "5f9745ba.8cabdc"\r
+                "c5f8d573.741818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40e5d82c.0988c",\r
+        "id": "cfba9c01.06834",\r
         "type": "comment",\r
         "name": "call string.contains to check if the cache has srcTtpdstTtpPair",\r
         "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.",\r
         "comments": "",\r
-        "x": 2015.6666870117188,\r
-        "y": 4318.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2060.2333374023438,\r
+        "y": 4333.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "37b719a7.3177d6",\r
+        "id": "d5ee8376.6d7b3",\r
         "type": "comment",\r
         "name": "create a new connectivity - (for dummy connectivity)",\r
         "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",\r
         "comments": "",\r
-        "x": 1882.6666564941406,\r
-        "y": 3516.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1927.2333068847656,\r
+        "y": 3531.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0f8f4ff.e42fa",\r
+        "id": "7d7a6dc.ff5ab14",\r
         "type": "save",\r
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1929.6666870117188,\r
-        "y": 3566.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1974.2333374023438,\r
+        "y": 3581.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "37e8875.87c3378"\r
+                "770ec83d.f5f698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37e8875.87c3378",\r
+        "id": "770ec83d.f5f698",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2217.6666870117188,\r
-        "y": 3567.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2262.2333374023438,\r
+        "y": 3582.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "90a3277d.c4bfc"\r
+                "1ea6c507.8eb3c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90a3277d.c4bfc",\r
+        "id": "1ea6c507.8eb3c3",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2401.1666870117188,\r
-        "y": 3566.15380859375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2445.7333374023438,\r
+        "y": 3580.720474243164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4b046e56.9a1b9",\r
+        "id": "4b1e068c.b603",\r
         "type": "execute",\r
         "name": "execute string.contains srcTtpdstTtpPair",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2003.6666870117188,\r
-        "y": 4370.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2048.2333374023438,\r
+        "y": 4385.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "779ce37e.93a47c",\r
-                "f1f0cfe.10d413"\r
+                "fa23bfea.633fa",\r
+                "5640420c.c8d724"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "779ce37e.93a47c",\r
+        "id": "fa23bfea.633fa",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2176.6666870117188,\r
-        "y": 4218.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2221.2333374023438,\r
+        "y": 4233.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f1f0cfe.10d413",\r
+        "id": "5640420c.c8d724",\r
         "type": "outcomeFalse",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2208.6666870117188,\r
-        "y": 4477.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2253.2333374023438,\r
+        "y": 4492.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "9f0cdaa9.449a9"\r
+                "745b8702.06258"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58dad5a1.4283d4",\r
+        "id": "566a0421.e07abc",\r
         "type": "save",\r
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2615.6666870117188,\r
-        "y": 4008.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2660.2333374023438,\r
+        "y": 4023.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "ca0562a9.f9dfa"\r
+                "e7e1a1af.83dc9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca0562a9.f9dfa",\r
+        "id": "e7e1a1af.83dc9",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2919.6666870117188,\r
-        "y": 4005.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2964.2333374023438,\r
+        "y": 4020.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "21917e0f.61cb02"\r
+                "9e39afad.724988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21917e0f.61cb02",\r
+        "id": "9e39afad.724988",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3070.1666870117188,\r
-        "y": 4013.15380859375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3114.7333374023438,\r
+        "y": 4027.720474243164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c456d560.e56b4",\r
+        "id": "5fd9a93f.71f3e",\r
         "type": "execute",\r
         "name": "execute UUID generator for connectivity domain otnidx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1909.6666870117188,\r
-        "y": 3621.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1954.2333374023438,\r
+        "y": 3636.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1c6b3c2b.a8cfe4",\r
+        "id": "e99e1220.c8d158",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1847.6666870117188,\r
-        "y": 3671.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1892.2333374023438,\r
+        "y": 3686.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "883e63bc.f1bf9",\r
+        "id": "e74eb1dd.b1cce",\r
         "type": "save",\r
         "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1948.6666870117188,\r
-        "y": 3716.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1993.2333374023438,\r
+        "y": 3731.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "67b90a5f.a2bde4",\r
+        "id": "d069cfb2.559918",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "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`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1984.6666870117188,\r
-        "y": 3770.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2029.2333374023438,\r
+        "y": 3785.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "44633bde.4c2f24",\r
+        "id": "db7724b7.c0b95",\r
         "type": "save",\r
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1952.6666870117188,\r
-        "y": 3829.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1997.2333374023438,\r
+        "y": 3844.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ad055e93.cbffc8",\r
+        "id": "dccc268f.14582",\r
         "type": "comment",\r
         "name": "find middle-man's eth-srv-name",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1410.6666870117188,\r
-        "y": 3445.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1455.2333374023438,\r
+        "y": 3460.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "17ca39fd.1576de",\r
+        "id": "6dfdf88f.4bb6c",\r
         "type": "set",\r
         "name": "set prop.ethernet-service-name",\r
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",\r
         "comments": "",\r
-        "x": 1432.6666870117188,\r
-        "y": 3489.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1477.2333374023438,\r
+        "y": 3504.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "91cb3623.bfa508",\r
+        "id": "e9be22f5.c3b77",\r
         "type": "save",\r
         "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2639.6666870117188,\r
-        "y": 4225.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2684.2333374023438,\r
+        "y": 4240.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "749face3.2a032c",\r
+        "id": "e3ac7685.f8539",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "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`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2670.6666870117188,\r
-        "y": 4264.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2715.2333374023438,\r
+        "y": 4279.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d1e29877.e2638",\r
+        "id": "8511409f.51bd2",\r
         "type": "save",\r
         "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2641.6666870117188,\r
-        "y": 4337.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2686.2333374023438,\r
+        "y": 4352.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ca553073.a3999",\r
+        "id": "65db0af6.94eaf4",\r
         "type": "comment",\r
         "name": "update the founded connectivity to have a new coupling-flag",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2611.6666870117188,\r
-        "y": 4053.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2656.2333374023438,\r
+        "y": 4068.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30b58e5f.9a5412",\r
+        "id": "537df036.3150f",\r
         "type": "set",\r
         "name": "set newFlag",\r
         "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2497.6666870117188,\r
-        "y": 4092.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2542.2333374023438,\r
+        "y": 4107.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b32f2c11.a0cbd",\r
+        "id": "73887d45.2afa44",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2561.6666870117188,\r
-        "y": 4137.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2606.2333374023438,\r
+        "y": 4152.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b26dba6c.6455b",\r
+        "id": "442047ec.b76048",\r
         "type": "comment",\r
         "name": "the following two relationships should have already been there; if not => error",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2653.6666870117188,\r
-        "y": 4187.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2698.2333374023438,\r
+        "y": 4202.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f615578d.11ca3",\r
+        "id": "a6868862.e0d7a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1639.6666870117188,\r
-        "y": 3554.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1684.2333374023438,\r
+        "y": 3569.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "f0f8f4ff.e42fa",\r
-                "c456d560.e56b4",\r
-                "1c6b3c2b.a8cfe4",\r
-                "883e63bc.f1bf9",\r
-                "67b90a5f.a2bde4",\r
-                "44633bde.4c2f24"\r
+                "7d7a6dc.ff5ab14",\r
+                "5fd9a93f.71f3e",\r
+                "e99e1220.c8d158",\r
+                "e74eb1dd.b1cce",\r
+                "d069cfb2.559918",\r
+                "db7724b7.c0b95"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d9dc789.fabfa",\r
+        "id": "5bde363c.523c48",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1501.6666870117188,\r
-        "y": 3550.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1546.2333374023438,\r
+        "y": 3565.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "f615578d.11ca3"\r
+                "a6868862.e0d7a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f9745ba.8cabdc",\r
+        "id": "c5f8d573.741818",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2299.6666870117188,\r
-        "y": 4017.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2344.2333374023438,\r
+        "y": 4032.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "58dad5a1.4283d4",\r
-                "30b58e5f.9a5412",\r
-                "b32f2c11.a0cbd",\r
-                "d1e29877.e2638"\r
+                "566a0421.e07abc",\r
+                "537df036.3150f",\r
+                "73887d45.2afa44",\r
+                "8511409f.51bd2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe407594.64cba8",\r
+        "id": "8b5f6b52.3288",\r
         "type": "comment",\r
         "name": "loop through the relationships of this founded connectivity, then",\r
         "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",\r
         "comments": "",\r
-        "x": 2304.6666870117188,\r
-        "y": 4442.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2349.2333374023438,\r
+        "y": 4457.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c41409e5.b5d3c",\r
+        "id": "1a02430.b289b3d",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2646.6666870117188,\r
-        "y": 4478.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2691.2333374023438,\r
+        "y": 4493.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "edec3f37.241e6"\r
+                "cd907dba.e4d3c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "edec3f37.241e6",\r
+        "id": "cd907dba.e4d3c8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2858.6666870117188,\r
-        "y": 4476.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2903.2333374023438,\r
+        "y": 4491.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "1919beb6.7cb971"\r
+                "20ed8870.8c9e9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1919beb6.7cb971",\r
+        "id": "20ed8870.8c9e9",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3042.6666870117188,\r
-        "y": 4474.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3087.2333374023438,\r
+        "y": 4489.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "df4bf19a.978d2"\r
+                "3940766f.dd75d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df4bf19a.978d2",\r
+        "id": "3940766f.dd75d2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3221.6666870117188,\r
-        "y": 4479.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3266.2333374023438,\r
+        "y": 4494.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "89ff485c.8db648",\r
-                "2bf1f71c.a919d"\r
+                "de8d19cf.e0eb38",\r
+                "501e7414.822a34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2bf1f71c.a919d",\r
+        "id": "501e7414.822a34",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 3438.6666870117188,\r
-        "y": 4410.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3483.2333374023438,\r
+        "y": 4425.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "89ff485c.8db648",\r
+        "id": "de8d19cf.e0eb38",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3431.6666870117188,\r
-        "y": 4496.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3476.2333374023438,\r
+        "y": 4511.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "5ee5ca48.dc9864",\r
-                "e1c034fb.99a648",\r
-                "c5ac5c6f.6f9258"\r
+                "fabce7f.821b298",\r
+                "84c19fc0.ef7ad8",\r
+                "d8007fa7.e96748"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1c034fb.99a648",\r
+        "id": "84c19fc0.ef7ad8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3645.1576538085938,\r
-        "y": 4481.473937988281,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3689.7243041992188,\r
+        "y": 4496.040603637695,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "6e271c06.d0d73c"\r
+                "ab7f4c85.a03338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e271c06.d0d73c",\r
+        "id": "ab7f4c85.a03338",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3807.7291870117188,\r
-        "y": 4480.7596435546875,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3852.2958374023438,\r
+        "y": 4495.326309204102,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "38e2891f.3394ee",\r
+        "id": "c7bb2a00.8d6e3",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3808.6666870117188,\r
-        "y": 4525.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3853.2333374023438,\r
+        "y": 4540.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c5ac5c6f.6f9258",\r
+        "id": "d8007fa7.e96748",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3640.6666870117188,\r
-        "y": 4525.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3685.2333374023438,\r
+        "y": 4540.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "38e2891f.3394ee"\r
+                "c7bb2a00.8d6e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ee5ca48.dc9864",\r
+        "id": "fabce7f.821b298",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3642.6666870117188,\r
-        "y": 4585.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3687.2333374023438,\r
+        "y": 4600.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "e13c4300.ac87f"\r
+                "44bdcb57.5d1c04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e13c4300.ac87f",\r
+        "id": "44bdcb57.5d1c04",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3811.6666870117188,\r
-        "y": 4584.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 3856.2333374023438,\r
+        "y": 4599.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "3fedffc1.068a9"\r
+                "ab8a9481.ed1188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f0cdaa9.449a9",\r
+        "id": "745b8702.06258",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2435.6666870117188,\r
-        "y": 4476.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2480.2333374023438,\r
+        "y": 4491.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "c41409e5.b5d3c",\r
-                "ef03524f.322ab",\r
-                "a41cf4f1.35b988"\r
+                "1a02430.b289b3d",\r
+                "b7b42ab.e3d1558",\r
+                "e37b8cbd.aee6b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3fedffc1.068a9",\r
+        "id": "ab8a9481.ed1188",\r
         "type": "switchNode",\r
         "name": "switch srcTtp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4010.6666870117188,\r
-        "y": 4585.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4055.2333374023438,\r
+        "y": 4600.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "46797ae5.8f5fdc"\r
+                "b7cd5564.ed6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46797ae5.8f5fdc",\r
+        "id": "b7cd5564.ed6c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4173.666687011719,\r
-        "y": 4583.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4218.233337402344,\r
+        "y": 4598.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "26801daf.757d4a"\r
+                "ccabadec.a87d08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26801daf.757d4a",\r
+        "id": "ccabadec.a87d08",\r
         "type": "switchNode",\r
         "name": "switch dstTtp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4354.666687011719,\r
-        "y": 4583.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4399.233337402344,\r
+        "y": 4598.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "4ecd0d28.02b6dc"\r
+                "61252d2.f400154"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ecd0d28.02b6dc",\r
+        "id": "61252d2.f400154",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4517.666687011719,\r
-        "y": 4581.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4562.233337402344,\r
+        "y": 4596.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "2b446601.7eb632"\r
+                "c33d2a30.0a34e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "efbe91c3.9535c8",\r
+        "id": "73039273.69e874",\r
         "type": "set",\r
         "name": "set tmp.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",\r
         "comments": "",\r
-        "x": 4874.666687011719,\r
-        "y": 4588.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4919.233337402344,\r
+        "y": 4603.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b446601.7eb632",\r
+        "id": "c33d2a30.0a34e8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4656.666687011719,\r
-        "y": 4580.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4701.233337402344,\r
+        "y": 4595.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "efbe91c3.9535c8",\r
-                "1b35126e.c915be"\r
+                "73039273.69e874",\r
+                "9503d547.7a1c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b35126e.c915be",\r
+        "id": "9503d547.7a1c98",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4820.666687011719,\r
-        "y": 4632.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 4865.233337402344,\r
+        "y": 4647.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ef03524f.322ab",\r
+        "id": "b7b42ab.e3d1558",\r
         "type": "set",\r
         "name": "unset tmp.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 2656.6666870117188,\r
-        "y": 4439.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2701.2333374023438,\r
+        "y": 4454.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb2c64f6.a88498",\r
+        "id": "d737e9cc.f602b8",\r
         "type": "comment",\r
         "name": "increase the bw of the-vpn-binding and change status to modified",\r
         "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
         "comments": "",\r
-        "x": 2745.6666870117188,\r
-        "y": 4613.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2790.2333374023438,\r
+        "y": 4628.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a41cf4f1.35b988",\r
+        "id": "e37b8cbd.aee6b8",\r
         "type": "save",\r
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2715.6666870117188,\r
-        "y": 4673.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 2760.2333374023438,\r
+        "y": 4688.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "655b0cf9.434f14",\r
+        "id": "252a570f.f396c8",\r
         "type": "execute",\r
         "name": "execute UUID generator for vpn-binding $otnidx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1550.6666870117188,\r
-        "y": 2841.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1595.2333374023438,\r
+        "y": 2856.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "390f0f63.f5713",\r
+        "id": "a19e39b9.f8da1",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1630.6666870117188,\r
-        "y": 2892.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1675.2333374023438,\r
+        "y": 2907.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "46e17225.a2db0c"\r
+                "f653960c.909178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46e17225.a2db0c",\r
+        "id": "f653960c.909178",\r
         "type": "set",\r
         "name": "set access-provider-id and client-id",\r
         "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",\r
         "comments": "",\r
-        "x": 1844.6666870117188,\r
-        "y": 2891.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1889.2333374023438,\r
+        "y": 2906.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2286c595.dee83a",\r
+        "id": "8f4a3300.fba8d8",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "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",\r
         "comments": "",\r
-        "x": 1210.5665893554688,\r
-        "y": 2476.89990234375,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1255.1332397460938,\r
+        "y": 2491.466567993164,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": []\r
     },\r
     {\r
-        "id": "62f58207.69b144",\r
+        "id": "929a93b0.fb26e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 985.2000122070312,\r
-        "y": 2493.13330078125,\r
-        "z": "ab59e982.86c81",\r
+        "x": 1029.7666625976562,\r
+        "y": 2507.699966430664,\r
+        "z": "ba0dc87e.a3b258",\r
         "wires": [\r
             [\r
-                "2286c595.dee83a",\r
-                "4da32200.1a505"\r
+                "8f4a3300.fba8d8",\r
+                "1365d05a.43ccb8"\r
             ]\r
         ]\r
     }\r

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
index 3fb30cd..8897cd2 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "4bf68406.ddcfc4",\r
+        "id": "e4aeb52e.202cc8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 252.33331298828125,\r
-        "y": 102.33334350585938,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 204.56666564941406,\r
+        "y": 120,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             [\r
-                "556d56b1.8aa24"\r
+                "9feb921c.82a788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "556d56b1.8aa24",\r
+        "id": "9feb921c.82a788",\r
         "type": "service-logic",\r
-        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "name": "GENERIC-RESOURCE-API 777",\r
         "module": "GENERIC-RESOURCE-API",\r
-        "version": "${project.version}",\r
+        "version": "777",\r
         "comments": "",\r
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
+        "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'>",\r
         "outputs": 1,\r
-        "x": 536.6190032958984,\r
-        "y": 163.5714521408081,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 488.85235595703125,\r
+        "y": 181.23810863494873,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             [\r
-                "5ee8264.6655ed8"\r
+                "6348e040.131e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ee8264.6655ed8",\r
+        "id": "6348e040.131e2",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-callbackdg-notification",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 523.7619018554688,\r
-        "y": 239.3333740234375,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 475.99525451660156,\r
+        "y": 257.0000305175781,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             [\r
-                "662af79a.da0ee8"\r
+                "afa43904.62cb1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "662af79a.da0ee8",\r
+        "id": "afa43904.62cb1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 852.5713500976562,\r
-        "y": 240.00003051757812,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 804.8047027587891,\r
+        "y": 257.66668701171875,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             [\r
-                "49cf2266.9e9664",\r
-                "6d86a3cf.e795b4",\r
-                "747b5a7a.94fc0c",\r
-                "82c91d0d.6b833",\r
-                "d8e4f1a3.d839d",\r
-                "32379d64.d2f70a",\r
-                "2e37faa.5c2ae06",\r
-                "83f79f41.a9ad3"\r
+                "b180367c.1f9198",\r
+                "7ef57ba6.1f727c",\r
+                "c42a69a0.a4eb7",\r
+                "5786b926.3906a8",\r
+                "b1e4d5b8.551e78",\r
+                "38d39329.9d1d2c",\r
+                "25fc0d1d.85e28a",\r
+                "93ceb81d.d133c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49cf2266.9e9664",\r
+        "id": "b180367c.1f9198",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1103.3333129882812,\r
-        "y": 240.33334350585938,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 1055.566665649414,\r
+        "y": 258,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6d86a3cf.e795b4",\r
+        "id": "7ef57ba6.1f727c",\r
         "type": "set",\r
         "name": "set received notification parameters",\r
         "xml": "<set>\n<!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->\n<parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />\n<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />\n<parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />\n<parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />",\r
         "comments": "",\r
-        "x": 1131.3333740234375,\r
-        "y": 413.3333435058594,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 1083.5667266845703,\r
+        "y": 431,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83f79f41.a9ad3",\r
+        "id": "93ceb81d.d133c",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"CallBack DG For SSE CONNECTION is called\"/>\n<!--<parameter name=\"field2\" value=\"`$rcvdNotif`\"/>-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1067.3333740234375,\r
-        "y": 184.33334350585938,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 1019.5667266845703,\r
+        "y": 202,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "747b5a7a.94fc0c",\r
+        "id": "c42a69a0.a4eb7",\r
         "type": "save",\r
         "name": "save:metadata to AAI",\r
-        "xml": "<!--<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"-->\n<!-- key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  -->\n<!--\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->\n<!--\t  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->\n<!--\t  AND service-instance.service-instance-id =  $rcvd-service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />\n",\r
+        "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         ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1088.3333740234375,\r
-        "y": 476.3333435058594,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 1040.5667266845703,\r
+        "y": 494,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "32379d64.d2f70a",\r
+        "id": "38d39329.9d1d2c",\r
         "type": "set",\r
         "name": "set parameters",\r
         "xml": "<set>\n<parameter name='eventIdUuid' value=\"`'BandwidthChanged_' + $eventId-uuid`\" />\n<parameter name='eventNameUuid' value='`$eventName-uuid`' />\n<parameter name='cclId' value='`$rcvd-service-instance-id`' />\n<parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />\n<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />\n",\r
         "comments": "",\r
-        "x": 1067.3333740234375,\r
-        "y": 723.3333129882812,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 1019.5667266845703,\r
+        "y": 740.9999694824219,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2e37faa.5c2ae06",\r
+        "id": "25fc0d1d.85e28a",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode call VES",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.dcaeAddrAndPort + '/eventListener/v7'`\" />\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />-->\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"ves-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1125.3333740234375,\r
-        "y": 766.3333129882812,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 1077.5667266845703,\r
+        "y": 783.9999694824219,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "82c91d0d.6b833",\r
+        "id": "5786b926.3906a8",\r
         "type": "execute",\r
         "name": "execute UUID generator for eventId",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1129.3333740234375,\r
-        "y": 631.3333129882812,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 1081.5667266845703,\r
+        "y": 648.9999694824219,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d8e4f1a3.d839d",\r
+        "id": "b1e4d5b8.551e78",\r
         "type": "execute",\r
         "name": "execute UUID generator for eventName",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1142.3333740234375,\r
-        "y": 673.3333129882812,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 1094.5667266845703,\r
+        "y": 690.9999694824219,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d1081f1a.6938",\r
+        "id": "2ee5d5bb.37a0e2",\r
         "type": "comment",\r
         "name": "Calling VES and passing notification parameters",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1156.3333740234375,\r
-        "y": 576.3333129882812,\r
-        "z": "f5fa16f3.117ab8",\r
+        "x": 1108.5667266845703,\r
+        "y": 593.9999694824219,\r
+        "z": "bdffb6ef.b80cc8",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-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 338c645..2fc491a 100644 (file)
--- 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 @@
 [\r
   {\r
-    "id": "eebfe6b4.36c4f8",\r
+    "id": "934a37b5.570538",\r
     "type": "dgstart",\r
     "name": "DGSTART",\r
     "outputs": 1,\r
-    "x": 140,\r
-    "y": 119,\r
-    "z": "f8944603.71553",\r
+    "x": 132.56666564941406,\r
+    "y": 130,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f39097a1.daa63"\r
+        "56cf7e3f.c20408"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f39097a1.daa63",\r
+    "id": "56cf7e3f.c20408",\r
     "type": "service-logic",\r
     "name": "GENERIC-RESOURCE-API ${project.version}",\r
     "module": "GENERIC-RESOURCE-API",\r
@@ -22,7886 +22,7886 @@
     "comments": "",\r
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
     "outputs": 1,\r
-    "x": 424.2856903076172,\r
-    "y": 180.23810863494873,\r
-    "z": "f8944603.71553",\r
+    "x": 416.85235595703125,\r
+    "y": 191.23810863494873,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "af444c12.6df4"\r
+        "9d6f7a83.dd2e58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af444c12.6df4",\r
+    "id": "9d6f7a83.dd2e58",\r
     "type": "method",\r
     "name": "method cll-vnf-topology-operation-cll-create-clean",\r
     "xml": "<method rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 430.42860412597656,\r
-    "y": 265.0000305175781,\r
-    "z": "f8944603.71553",\r
+    "x": 422.9952697753906,\r
+    "y": 276.0000305175781,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cd7fb41b.b80af8"\r
+        "69ada9d9.f9e3c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cd7fb41b.b80af8",\r
+    "id": "69ada9d9.f9e3c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 780,\r
-    "y": 324,\r
-    "z": "f8944603.71553",\r
+    "x": 772.5666656494141,\r
+    "y": 335,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "1330d7b6.40f6",\r
-        "327e5a08.352bde",\r
-        "b36ceae.9917d98"\r
+        "8dd82f3b.b9fa5",\r
+        "304cbf07.b12f58",\r
+        "1a3f65b2.521b1a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1330d7b6.40f6",\r
+    "id": "8dd82f3b.b9fa5",\r
     "type": "returnSuccess",\r
     "name": "return success",\r
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
     "comments": "",\r
-    "x": 1081.33349609375,\r
-    "y": 594.9302978515625,\r
-    "z": "f8944603.71553",\r
+    "x": 1073.900161743164,\r
+    "y": 605.9302978515625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "327e5a08.352bde",\r
+    "id": "304cbf07.b12f58",\r
     "type": "save",\r
     "name": "get service-instance from aai",\r
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1102.761962890625,\r
-    "y": 297.33331298828125,\r
-    "z": "f8944603.71553",\r
+    "x": 1095.328628540039,\r
+    "y": 308.33331298828125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "393ddb72.9cdaac",\r
-        "27423ab.7bf7dc6",\r
-        "e70357b.8e78fa8"\r
+        "c42506f9.b054",\r
+        "15d85509.bac5fb",\r
+        "c693218f.780828"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "393ddb72.9cdaac",\r
+    "id": "c42506f9.b054",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1327.761962890625,\r
-    "y": 155.33331298828125,\r
-    "z": "f8944603.71553",\r
+    "x": 1320.328628540039,\r
+    "y": 166.33331298828125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "db827fdb.ec8a7"\r
+        "c432fa86.b14b18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "27423ab.7bf7dc6",\r
+    "id": "15d85509.bac5fb",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1323.2529296875,\r
-    "y": 224.9073486328125,\r
-    "z": "f8944603.71553",\r
+    "x": 1315.819595336914,\r
+    "y": 235.9073486328125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "2aba6522.745fa2"\r
+        "c16eebd5.51383"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e70357b.8e78fa8",\r
+    "id": "c693218f.780828",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1311.761962890625,\r
-    "y": 271.33331298828125,\r
-    "z": "f8944603.71553",\r
+    "x": 1304.328628540039,\r
+    "y": 282.33331298828125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "85c2ab27.5d7c"\r
+        "3a0cbeb0.e80882"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d67dd652.2acc48",\r
+    "id": "2b8d35c8.ebc05a",\r
     "type": "comment",\r
     "name": "new for TransportSlicing",\r
     "info": "",\r
     "comments": "",\r
-    "x": 1081.761962890625,\r
-    "y": 185.33331298828125,\r
-    "z": "f8944603.71553",\r
+    "x": 1074.328628540039,\r
+    "y": 196.33331298828125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b36ceae.9917d98",\r
+    "id": "1a3f65b2.521b1a",\r
     "type": "execute",\r
     "name": "execute properties",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1069.761962890625,\r
-    "y": 237.33331298828125,\r
-    "z": "f8944603.71553",\r
+    "x": 1062.328628540039,\r
+    "y": 248.33331298828125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "db827fdb.ec8a7",\r
+    "id": "c432fa86.b14b18",\r
     "type": "switchNode",\r
     "name": "switch allotted-resources_length != 0",\r
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1568,\r
-    "y": 152,\r
-    "z": "f8944603.71553",\r
+    "x": 1560.566665649414,\r
+    "y": 163,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cb5b5e94.b15ef8",\r
-        "b997ad22.d70e8"\r
+        "1d921b54.6d01cd",\r
+        "4b7292d8.462d44"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2aba6522.745fa2",\r
+    "id": "c16eebd5.51383",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 1478.0623779296875,\r
-    "y": 227.85977172851562,\r
-    "z": "f8944603.71553",\r
+    "x": 1470.6290435791016,\r
+    "y": 238.85977172851562,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "85c2ab27.5d7c",\r
+    "id": "3a0cbeb0.e80882",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 1482,\r
-    "y": 272,\r
-    "z": "f8944603.71553",\r
+    "x": 1474.566665649414,\r
+    "y": 283,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cb5b5e94.b15ef8",\r
+    "id": "1d921b54.6d01cd",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1773,\r
-    "y": 189,\r
-    "z": "f8944603.71553",\r
+    "x": 1765.566665649414,\r
+    "y": 200,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "3cb72715.02a808"\r
+        "e73b29c9.cbd5e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b997ad22.d70e8",\r
+    "id": "4b7292d8.462d44",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1783,\r
-    "y": 116,\r
-    "z": "f8944603.71553",\r
+    "x": 1775.566665649414,\r
+    "y": 127,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3cb72715.02a808",\r
+    "id": "e73b29c9.cbd5e8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1766,\r
-    "y": 264,\r
-    "z": "f8944603.71553",\r
+    "x": 1758.566665649414,\r
+    "y": 275,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ebf5f2d6.b4c7b8",\r
-        "490f1cae.a20b64",\r
-        "b4dd975f.8385a8",\r
-        "43a803a5.2842f4",\r
-        "651a17c0.63b678"\r
+        "d6fcbbd7.6468b8",\r
+        "8f5c7a9a.326598",\r
+        "cd48af2d.929d6",\r
+        "528e88db.403fc",\r
+        "899de386.880988"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d707b8ba.d22b28",\r
+    "id": "1f336392.1dac3c",\r
     "type": "save",\r
     "name": "get allotted-resource from aai",\r
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2252,\r
-    "y": 315,\r
-    "z": "f8944603.71553",\r
+    "x": 2244.566665649414,\r
+    "y": 326,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "3717142f.9eacbc",\r
-        "81f224b1.8ce278",\r
-        "360e18d9.8e8878"\r
+        "923c23f1.638a98",\r
+        "ba451af8.67c9c8",\r
+        "2ed7be49.0a7032"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3717142f.9eacbc",\r
+    "id": "923c23f1.638a98",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2468,\r
-    "y": 382,\r
-    "z": "f8944603.71553",\r
+    "x": 2460.566665649414,\r
+    "y": 393,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "90fe9f39.2d3b48"\r
+        "c090e3a4.ec2058"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "81f224b1.8ce278",\r
+    "id": "ba451af8.67c9c8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2468.490966796875,\r
-    "y": 281.573974609375,\r
-    "z": "f8944603.71553",\r
+    "x": 2461.057632446289,\r
+    "y": 292.573974609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "fa7677d5.848dd"\r
+        "4c29ba0c.292a6c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "360e18d9.8e8878",\r
+    "id": "2ed7be49.0a7032",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2464,\r
-    "y": 331,\r
-    "z": "f8944603.71553",\r
+    "x": 2456.566665649414,\r
+    "y": 342,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "72c2923b.56a34c"\r
+        "f2cd659.3fc4898"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ebf5f2d6.b4c7b8",\r
+    "id": "d6fcbbd7.6468b8",\r
     "type": "for",\r
     "name": "for each allotted-resource",\r
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1969,\r
-    "y": 296,\r
-    "z": "f8944603.71553",\r
+    "x": 1961.566665649414,\r
+    "y": 307,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "618e3f4f.a42bf",\r
-        "d707b8ba.d22b28",\r
-        "e8527008.db6228",\r
-        "a669b945.663408"\r
+        "419d8708.3b9078",\r
+        "1f336392.1dac3c",\r
+        "90827cac.7f3cc8",\r
+        "e557ce2.09f823"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "618e3f4f.a42bf",\r
+    "id": "419d8708.3b9078",\r
     "type": "set",\r
     "name": "set the current allotted-resource-id",\r
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 2249,\r
-    "y": 234,\r
-    "z": "f8944603.71553",\r
+    "x": 2241.566665649414,\r
+    "y": 245,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "43a803a5.2842f4",\r
+    "id": "528e88db.403fc",\r
     "type": "set",\r
     "name": "set tmp.arr",\r
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",\r
     "comments": "",\r
-    "x": 1943,\r
-    "y": 246,\r
-    "z": "f8944603.71553",\r
+    "x": 1935.566665649414,\r
+    "y": 257,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "490f1cae.a20b64",\r
+    "id": "8f5c7a9a.326598",\r
     "type": "get-resource",\r
     "name": "get-resource pnfs-list",\r
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",\r
+    "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\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1986,\r
-    "y": 105,\r
-    "z": "f8944603.71553",\r
+    "x": 1978.566665649414,\r
+    "y": 116,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b4dd975f.8385a8",\r
+    "id": "cd48af2d.929d6",\r
     "type": "get-resource",\r
     "name": "get-resource logical-links",\r
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",\r
+    "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\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1998,\r
-    "y": 146,\r
-    "z": "f8944603.71553",\r
+    "x": 1990.566665649414,\r
+    "y": 157,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d38afd8a.8bc96",\r
+    "id": "73efca11.a03e0c",\r
     "type": "comment",\r
     "name": "The following two nodes are for PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 2023,\r
-    "y": 58,\r
-    "z": "f8944603.71553",\r
+    "x": 2015.566665649414,\r
+    "y": 69,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8fedb211.a1c3d8",\r
+    "id": "19fb453a.d497cb",\r
     "type": "set",\r
     "name": "set tmp.arr",\r
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",\r
     "comments": "",\r
-    "x": 1943,\r
-    "y": 192,\r
-    "z": "f8944603.71553",\r
+    "x": 1935.566665649414,\r
+    "y": 203,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fa7677d5.848dd",\r
+    "id": "4c29ba0c.292a6c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 2647,\r
-    "y": 284,\r
-    "z": "f8944603.71553",\r
+    "x": 2639.566665649414,\r
+    "y": 295,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "72c2923b.56a34c",\r
+    "id": "f2cd659.3fc4898",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 2646.9375,\r
-    "y": 333.1402587890625,\r
-    "z": "f8944603.71553",\r
+    "x": 2639.504165649414,\r
+    "y": 344.1402587890625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "90fe9f39.2d3b48",\r
+    "id": "c090e3a4.ec2058",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2648.9375,\r
-    "y": 384.1402587890625,\r
-    "z": "f8944603.71553",\r
+    "x": 2641.504165649414,\r
+    "y": 395.1402587890625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "458d5965.a3abf"\r
+        "383f413.f1d10be"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "458d5965.a3abf",\r
+    "id": "383f413.f1d10be",\r
     "type": "save",\r
     "name": "get allotted-resource relationship from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2941.9375,\r
-    "y": 331.1402587890625,\r
-    "z": "f8944603.71553",\r
+    "x": 2934.504165649414,\r
+    "y": 342.1402587890625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9e8135ff.08a04",\r
-        "11480c56.53825c",\r
-        "c18b528b.950eb"\r
+        "7f2204ba.ff0eac",\r
+        "6593ad3c.c3a94c",\r
+        "91d5dd73.0552a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "11480c56.53825c",\r
+    "id": "6593ad3c.c3a94c",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3245.428436279297,\r
-    "y": 63.7142333984375,\r
-    "z": "f8944603.71553",\r
+    "x": 3237.995101928711,\r
+    "y": 74.7142333984375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "fafa91c8.b89"\r
+        "578e5a01.301d74"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fafa91c8.b89",\r
+    "id": "578e5a01.301d74",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3422.999969482422,\r
-    "y": 64,\r
-    "z": "f8944603.71553",\r
+    "x": 3415.566635131836,\r
+    "y": 75,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c18b528b.950eb",\r
+    "id": "91d5dd73.0552a8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3240.937469482422,\r
-    "y": 113.1402587890625,\r
-    "z": "f8944603.71553",\r
+    "x": 3233.504135131836,\r
+    "y": 124.1402587890625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "c9c4d95e.e78bc8"\r
+        "3a340bd0.83bde4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c9c4d95e.e78bc8",\r
+    "id": "3a340bd0.83bde4",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3422.937469482422,\r
-    "y": 113.1402587890625,\r
-    "z": "f8944603.71553",\r
+    "x": 3415.504135131836,\r
+    "y": 124.1402587890625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9e8135ff.08a04",\r
+    "id": "7f2204ba.ff0eac",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3244.937469482422,\r
-    "y": 164.1402587890625,\r
-    "z": "f8944603.71553",\r
+    "x": 3237.504135131836,\r
+    "y": 175.1402587890625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "249c683e.fa6548"\r
+        "5f6b46f2.1bbc28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "249c683e.fa6548",\r
+    "id": "5f6b46f2.1bbc28",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3424.937469482422,\r
-    "y": 164.1402587890625,\r
-    "z": "f8944603.71553",\r
+    "x": 3417.504135131836,\r
+    "y": 175.1402587890625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8380148b.ccdda"\r
+        "432203ff.80791c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8380148b.ccdda",\r
+    "id": "432203ff.80791c",\r
     "type": "switchNode",\r
     "name": "switch allotted-resource.relationship-list not empty",\r
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2961,\r
-    "y": 459,\r
-    "z": "f8944603.71553",\r
+    "x": 2953.566665649414,\r
+    "y": 470,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f9f860ee.48ada",\r
-        "3ee71a32.7e39ae"\r
+        "25bf5884.d1bc1",\r
+        "68d7ca3f.b9c4a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3ee71a32.7e39ae",\r
+    "id": "68d7ca3f.b9c4a4",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3300.999969482422,\r
-    "y": 306,\r
-    "z": "f8944603.71553",\r
+    "x": 3293.566635131836,\r
+    "y": 317,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f9f860ee.48ada",\r
+    "id": "25bf5884.d1bc1",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3299.999969482422,\r
-    "y": 360,\r
-    "z": "f8944603.71553",\r
+    "x": 3292.566635131836,\r
+    "y": 371,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "88c3b86.63e2c48"\r
+        "a4256717.8bdab"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b0fb22ca.f9ce1",\r
+    "id": "dc3dd60e.e6fb58",\r
     "type": "outcome",\r
     "name": "network-policy",\r
     "xml": "<outcome value='network-policy'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4044.999969482422,\r
-    "y": 314,\r
-    "z": "f8944603.71553",\r
+    "x": 4037.566635131836,\r
+    "y": 325,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "5f3f920d.e5225c"\r
+        "7a99d9c1.cc807"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5f3f920d.e5225c",\r
+    "id": "7a99d9c1.cc807",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4221.999847412109,\r
-    "y": 306.9998779296875,\r
-    "z": "f8944603.71553",\r
+    "x": 4214.566513061523,\r
+    "y": 317.9998779296875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8197a230.f5fc28",\r
-        "add943b3.661de"\r
+        "54329230.9376a4",\r
+        "e44ffd73.3caae8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "88c3b86.63e2c48",\r
+    "id": "a4256717.8bdab",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3463.999969482422,\r
-    "y": 286,\r
-    "z": "f8944603.71553",\r
+    "x": 3456.566635131836,\r
+    "y": 297,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b1327250.c3733",\r
-        "de9a0d51.d824a"\r
+        "ab8d2f4.fb7de5",\r
+        "6cd92abd.ea602c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b1327250.c3733",\r
+    "id": "ab8d2f4.fb7de5",\r
     "type": "for",\r
     "name": "for each allotted-resource relationship",\r
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3744.999969482422,\r
-    "y": 242,\r
-    "z": "f8944603.71553",\r
+    "x": 3737.566635131836,\r
+    "y": 253,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "64d386dc.4f4038"\r
+        "d2f6d2c1.0cd0b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "64d386dc.4f4038",\r
+    "id": "d2f6d2c1.0cd0b8",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4006.999969482422,\r
-    "y": 242,\r
-    "z": "f8944603.71553",\r
+    "x": 3999.566635131836,\r
+    "y": 253,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b0fb22ca.f9ce1"\r
+        "dc3dd60e.e6fb58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8197a230.f5fc28",\r
+    "id": "54329230.9376a4",\r
     "type": "set",\r
     "name": "set the 1st network-policy-id",\r
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4464.999847412109,\r
-    "y": 263.9998779296875,\r
-    "z": "f8944603.71553",\r
+    "x": 4457.566513061523,\r
+    "y": 274.9998779296875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "add943b3.661de",\r
+    "id": "e44ffd73.3caae8",\r
     "type": "save",\r
     "name": "get network-policy from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4453.999847412109,\r
-    "y": 318.9998779296875,\r
-    "z": "f8944603.71553",\r
+    "x": 4446.566513061523,\r
+    "y": 329.9998779296875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "584012e4.8af54c",\r
-        "84e11e56.e2a698",\r
-        "b5114711.48fe28"\r
+        "9db3143c.c20748",\r
+        "3f90e90d.8c4416",\r
+        "767c00f3.c60f18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b5114711.48fe28",\r
+    "id": "767c00f3.c60f18",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4705.000213623047,\r
-    "y": 260,\r
-    "z": "f8944603.71553",\r
+    "x": 4697.566879272461,\r
+    "y": 271,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "3ff18282.41fa7e"\r
+        "eb2a7a65.4a99c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3ff18282.41fa7e",\r
+    "id": "eb2a7a65.4a99c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4853.571746826172,\r
-    "y": 260.2857666015625,\r
-    "z": "f8944603.71553",\r
+    "x": 4846.138412475586,\r
+    "y": 271.2857666015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "576f251.536f1dc",\r
+    "id": "1d4fa709.d3c2b1",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 4852.509246826172,\r
-    "y": 304.426025390625,\r
-    "z": "f8944603.71553",\r
+    "x": 4845.075912475586,\r
+    "y": 315.426025390625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "84e11e56.e2a698",\r
+    "id": "3f90e90d.8c4416",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4693.509246826172,\r
-    "y": 304.426025390625,\r
-    "z": "f8944603.71553",\r
+    "x": 4686.075912475586,\r
+    "y": 315.426025390625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "576f251.536f1dc"\r
+        "1d4fa709.d3c2b1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "584012e4.8af54c",\r
+    "id": "9db3143c.c20748",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4700.509246826172,\r
-    "y": 383.426025390625,\r
-    "z": "f8944603.71553",\r
+    "x": 4693.075912475586,\r
+    "y": 394.426025390625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "84e0295.fec0058"\r
+        "d725abd1.c0b928"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "84e0295.fec0058",\r
+    "id": "d725abd1.c0b928",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4839.509246826172,\r
-    "y": 383.426025390625,\r
-    "z": "f8944603.71553",\r
+    "x": 4832.075912475586,\r
+    "y": 394.426025390625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "40dc732c.a37574",\r
-        "72f9e36c.5c6004"\r
+        "561b0f6d.fce1f8",\r
+        "8702a1ee.cea5e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "40dc732c.a37574",\r
+    "id": "561b0f6d.fce1f8",\r
     "type": "set",\r
     "name": "set the max bandwidth",\r
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
     "comments": "",\r
-    "x": 5045.000213623047,\r
-    "y": 381,\r
-    "z": "f8944603.71553",\r
+    "x": 5037.566879272461,\r
+    "y": 392,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "72f9e36c.5c6004",\r
+    "id": "8702a1ee.cea5e8",\r
     "type": "set",\r
     "name": "set the max bandwidth",\r
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
     "comments": "",\r
-    "x": 5044.000213623047,\r
-    "y": 427,\r
-    "z": "f8944603.71553",\r
+    "x": 5036.566879272461,\r
+    "y": 438,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "de9a0d51.d824a",\r
+    "id": "6cd92abd.ea602c",\r
     "type": "for",\r
     "name": "for each allotted-resource relationship",\r
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3561.999969482422,\r
-    "y": 358,\r
-    "z": "f8944603.71553",\r
+    "x": 3554.566635131836,\r
+    "y": 369,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "1f9cf648.b23842"\r
+        "dd91e386.997658"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1f9cf648.b23842",\r
+    "id": "dd91e386.997658",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3841.999969482422,\r
-    "y": 358,\r
-    "z": "f8944603.71553",\r
+    "x": 3834.566635131836,\r
+    "y": 369,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9a7f86a9.e4bc3"\r
+        "d0b5ecff.91d928"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9a7f86a9.e4bc3",\r
+    "id": "d0b5ecff.91d928",\r
     "type": "outcome",\r
     "name": "logical-link",\r
     "xml": "<outcome value='logical-link'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2225.0001220703125,\r
-    "y": 771.0001220703125,\r
-    "z": "f8944603.71553",\r
+    "x": 2217.5667877197266,\r
+    "y": 782.0001220703125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "a00c69ca.adce48"\r
+        "3175715f.1727f6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a00c69ca.adce48",\r
+    "id": "3175715f.1727f6",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2402,\r
-    "y": 764,\r
-    "z": "f8944603.71553",\r
+    "x": 2394.566665649414,\r
+    "y": 775,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b1915aed.463e4",\r
-        "2d618162.692d86"\r
+        "e36efc83.994d78",\r
+        "41c74306.d5cc9c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b1915aed.463e4",\r
+    "id": "e36efc83.994d78",\r
     "type": "set",\r
     "name": "set the current logical-link-name",\r
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 2645,\r
-    "y": 721,\r
-    "z": "f8944603.71553",\r
+    "x": 2637.566665649414,\r
+    "y": 732,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2d618162.692d86",\r
+    "id": "41c74306.d5cc9c",\r
     "type": "save",\r
     "name": "get logical-link from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2634,\r
-    "y": 776,\r
-    "z": "f8944603.71553",\r
+    "x": 2626.566665649414,\r
+    "y": 787,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e482931e.42ecd",\r
-        "ed5f6487.2f87b",\r
-        "f8d33751.7b5a4"\r
+        "9d68f10f.bd8b8",\r
+        "dffb55fa.85b55",\r
+        "c53e6e84.05ac9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e482931e.42ecd",\r
+    "id": "9d68f10f.bd8b8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2925.490966796875,\r
-    "y": 754.573974609375,\r
-    "z": "f8944603.71553",\r
+    "x": 2918.057632446289,\r
+    "y": 765.573974609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "57635b4b.26640c"\r
+        "b9d2eb35.931cc8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ed5f6487.2f87b",\r
+    "id": "dffb55fa.85b55",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2914,\r
-    "y": 799,\r
-    "z": "f8944603.71553",\r
+    "x": 2906.566665649414,\r
+    "y": 810,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "a7b92e8f.8c52e8"\r
+        "e6924452.e6205"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "57635b4b.26640c",\r
+    "id": "b9d2eb35.931cc8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3074.0625,\r
-    "y": 754.8597412109375,\r
-    "z": "f8944603.71553",\r
+    "x": 3066.629165649414,\r
+    "y": 765.8597412109375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a7b92e8f.8c52e8",\r
+    "id": "e6924452.e6205",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3073,\r
-    "y": 799,\r
-    "z": "f8944603.71553",\r
+    "x": 3065.566665649414,\r
+    "y": 810,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f8d33751.7b5a4",\r
+    "id": "c53e6e84.05ac9",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2921,\r
-    "y": 878,\r
-    "z": "f8944603.71553",\r
+    "x": 2913.566665649414,\r
+    "y": 889,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "98a40400.3efa78"\r
+        "361f88a3.058c08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "98a40400.3efa78",\r
+    "id": "361f88a3.058c08",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3060,\r
-    "y": 878,\r
-    "z": "f8944603.71553",\r
+    "x": 3052.566665649414,\r
+    "y": 889,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "71736994.8ef448",\r
-        "262a2cdd.1722ec",\r
-        "6dffa8a4.87ef28",\r
-        "19dc8ab.73ff975",\r
-        "442ee5c4.7ebc14",\r
-        "55e39af5.a2b61c",\r
-        "22efa8c9.c8576",\r
-        "d6e1611b.9ddcf",\r
-        "b18620c8.640928",\r
-        "11e0f934.faeab7",\r
-        "b71f57a7.e2a288",\r
-        "f7d11626.bd108",\r
-        "7d22810d.66642",\r
-        "5fc2699f.6720b8",\r
-        "d4db1de6.243c9",\r
-        "4c9f1a43.e137e4",\r
-        "f953800.9cf34",\r
-        "1931dff5.72d728",\r
-        "be1fed24.75522",\r
-        "3ab03c8.bdf8544",\r
-        "d566dc7.835f6a"\r
+        "936c7f50.057838",\r
+        "fff97b6b.1650f8",\r
+        "40c59221.de8304",\r
+        "da2087d.3780d78",\r
+        "db5a893f.6acb2",\r
+        "855375ef.856b78",\r
+        "bd585daa.5b0d3",\r
+        "d3754757.4f2538",\r
+        "dd28e890.6f37f",\r
+        "10147ab3.fed6fd",\r
+        "425867c4.b0a9",\r
+        "e3e1a44c.9927b8",\r
+        "4a62d4e.fca9aac",\r
+        "2ae40328.466974",\r
+        "f71bee39.3d2f68",\r
+        "6cb3b80a.d81b1",\r
+        "7411f30.15b1c8c",\r
+        "59ced5c4.1cbb54",\r
+        "b2338e3d.f752e8",\r
+        "8b07e19d.5f94",\r
+        "877b276.88c73d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8992052.d396a78",\r
+    "id": "b5bad4b9.685ad8",\r
     "type": "execute",\r
     "name": "execute UUID generator for ethernet-service-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3409,\r
-    "y": 411.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3401.566665649414,\r
+    "y": 422.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "71736994.8ef448",\r
+    "id": "936c7f50.057838",\r
     "type": "execute",\r
     "name": "execute UUID generator for otn-tunnel-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3389.9999389648438,\r
-    "y": 490.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3382.566604614258,\r
+    "y": 501.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5fc2699f.6720b8",\r
+    "id": "2ae40328.466974",\r
     "type": "set",\r
     "name": "set new ethernet-service-name",\r
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3346.9999389648438,\r
-    "y": 535.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3339.566604614258,\r
+    "y": 546.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "262a2cdd.1722ec",\r
+    "id": "fff97b6b.1650f8",\r
     "type": "set",\r
     "name": "set network-route-one",\r
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3311.999969482422,\r
-    "y": 589.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3304.566635131836,\r
+    "y": 600.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6dffa8a4.87ef28",\r
+    "id": "40c59221.de8304",\r
     "type": "set",\r
     "name": "set network-route-two",\r
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3312.999969482422,\r
-    "y": 644.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3305.566635131836,\r
+    "y": 655.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "19dc8ab.73ff975",\r
+    "id": "da2087d.3780d78",\r
     "type": "save",\r
     "name": "get network-route-one from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3310.999969482422,\r
-    "y": 908.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3303.566635131836,\r
+    "y": 919.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "6a238476.e2fb94",\r
-        "535decdf.f72024",\r
-        "ae1cf5c7.80a6f8"\r
+        "969278b.6dcd308",\r
+        "8ef50320.33a2f",\r
+        "bc9f501b.616458"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "442ee5c4.7ebc14",\r
+    "id": "db5a893f.6acb2",\r
     "type": "save",\r
     "name": "get network-route-two from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3305.999969482422,\r
-    "y": 969.9998474121094,\r
-    "z": "f8944603.71553",\r
+    "x": 3298.566635131836,\r
+    "y": 980.9998474121094,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "3acf80af.f43f8",\r
-        "d256cf0d.9aea78",\r
-        "e101efde.aba"\r
+        "3f6dc76b.2c189",\r
+        "8fe533b.8ccffd",\r
+        "17823dcb.715f8a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6a238476.e2fb94",\r
+    "id": "969278b.6dcd308",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3621.999969482422,\r
-    "y": 679.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3614.566635131836,\r
+    "y": 690.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ab9f09fe.f29c98"\r
+        "9ca5fa1b.024df8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "535decdf.f72024",\r
+    "id": "8ef50320.33a2f",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3617.509002685547,\r
-    "y": 729.4259948730469,\r
-    "z": "f8944603.71553",\r
+    "x": 3610.075668334961,\r
+    "y": 740.4259948730469,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e4e6f924.884bf"\r
+        "e39d355.b4f33c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ae1cf5c7.80a6f8",\r
+    "id": "bc9f501b.616458",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3621.509002685547,\r
-    "y": 782.4259948730469,\r
-    "z": "f8944603.71553",\r
+    "x": 3614.075668334961,\r
+    "y": 793.4259948730469,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ab5ff9c2.10c8a"\r
+        "e84899ba.db50e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ab9f09fe.f29c98",\r
+    "id": "9ca5fa1b.024df8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3770.571502685547,\r
-    "y": 679.2857360839844,\r
-    "z": "f8944603.71553",\r
+    "x": 3763.138168334961,\r
+    "y": 690.2857360839844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e4e6f924.884bf",\r
+    "id": "e39d355.b4f33c8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3760.509002685547,\r
-    "y": 729.4259948730469,\r
-    "z": "f8944603.71553",\r
+    "x": 3753.075668334961,\r
+    "y": 740.4259948730469,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3acf80af.f43f8",\r
+    "id": "3f6dc76b.2c189",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3583.9999389648438,\r
-    "y": 869.9998168945312,\r
-    "z": "f8944603.71553",\r
+    "x": 3576.566604614258,\r
+    "y": 880.9998168945312,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "87a2e14c.f364a"\r
+        "62e0b7bc.37a4e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d256cf0d.9aea78",\r
+    "id": "8fe533b.8ccffd",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3579.509002685547,\r
-    "y": 912.4258728027344,\r
-    "z": "f8944603.71553",\r
+    "x": 3572.075668334961,\r
+    "y": 923.4258728027344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "98a18e9a.d4f5a"\r
+        "ac864505.12601"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e101efde.aba",\r
+    "id": "17823dcb.715f8a",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3580.509002685547,\r
-    "y": 965.4258728027344,\r
-    "z": "f8944603.71553",\r
+    "x": 3573.075668334961,\r
+    "y": 976.4258728027344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "4d45fe17.38da58"\r
+        "bed44813.048dd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "87a2e14c.f364a",\r
+    "id": "62e0b7bc.37a4e",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3732.5714721679688,\r
-    "y": 869.2855834960938,\r
-    "z": "f8944603.71553",\r
+    "x": 3725.138137817383,\r
+    "y": 880.2855834960938,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "98a18e9a.d4f5a",\r
+    "id": "ac864505.12601",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3722.509002685547,\r
-    "y": 912.4258728027344,\r
-    "z": "f8944603.71553",\r
+    "x": 3715.075668334961,\r
+    "y": 923.4258728027344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ab5ff9c2.10c8a",\r
+    "id": "e84899ba.db50e8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3782.999969482422,\r
-    "y": 781.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3775.566635131836,\r
+    "y": 792.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "84478c6a.6d587"\r
+        "f9db2337.8fb9d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4d45fe17.38da58",\r
+    "id": "bed44813.048dd",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3733.999969482422,\r
-    "y": 964.9998474121094,\r
-    "z": "f8944603.71553",\r
+    "x": 3726.566635131836,\r
+    "y": 975.9998474121094,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "2dfc998d.a2b3e6"\r
+        "423a02cf.14e434"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "84478c6a.6d587",\r
+    "id": "f9db2337.8fb9d",\r
     "type": "switchNode",\r
     "name": "switch nr type",\r
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3957.999969482422,\r
-    "y": 755.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3950.566635131836,\r
+    "y": 766.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "be084505.b458",\r
-        "5b2d2057.dd8c4",\r
-        "83ce05e.7f315f8"\r
+        "2c035f93.775ae8",\r
+        "a1971f98.6ccb48",\r
+        "dd62b4eb.26fb1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2dfc998d.a2b3e6",\r
+    "id": "423a02cf.14e434",\r
     "type": "switchNode",\r
     "name": "switch nr type",\r
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3917.999969482422,\r
-    "y": 872.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3910.566635131836,\r
+    "y": 883.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "27a94561.e70e32",\r
-        "e39a6c9c.1e6dd8",\r
-        "fe4b773c.0eae98"\r
+        "9f546ca0.9d33e8",\r
+        "2ec96d4e.1ca132",\r
+        "cb966d3f.bcf358"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be084505.b458",\r
+    "id": "2c035f93.775ae8",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4079.999969482422,\r
-    "y": 540.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4072.566635131836,\r
+    "y": 551.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "86b880d.ad45d"\r
+        "6429cd23.35e7c4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5b2d2057.dd8c4",\r
+    "id": "a1971f98.6ccb48",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4081.999969482422,\r
-    "y": 594.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4074.566635131836,\r
+    "y": 605.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "10eaea8a.998afd"\r
+        "17c9fbf5.2a0a34"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "27a94561.e70e32",\r
+    "id": "9f546ca0.9d33e8",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4099,\r
-    "y": 811,\r
-    "z": "f8944603.71553",\r
+    "x": 4091.566665649414,\r
+    "y": 822,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e84921e.f8ecce"\r
+        "22d232ad.fa9d6e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e39a6c9c.1e6dd8",\r
+    "id": "2ec96d4e.1ca132",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4101,\r
-    "y": 865,\r
-    "z": "f8944603.71553",\r
+    "x": 4093.566665649414,\r
+    "y": 876,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b7ebf9b7.e2f348"\r
+        "5c001c7.14606e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4ebe65d0.3ec92c",\r
+    "id": "d98ccbbe.37e04",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4389.999969482422,\r
-    "y": 492.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4382.566635131836,\r
+    "y": 503.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b5b3e89e.18b28",\r
+    "id": "449eb720.722948",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4382.999969482422,\r
-    "y": 590.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4375.566635131836,\r
+    "y": 601.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "81270995.5d712",\r
+    "id": "83bfbc5.ae6994",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4401,\r
-    "y": 784,\r
-    "z": "f8944603.71553",\r
+    "x": 4393.566665649414,\r
+    "y": 795,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7db54dd4.f36624",\r
+    "id": "5244a859.c728e8",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4405,\r
-    "y": 877,\r
-    "z": "f8944603.71553",\r
+    "x": 4397.566665649414,\r
+    "y": 888,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3464c217.ddf82e",\r
+    "id": "6ca3f458.2d99d4",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3548,\r
-    "y": 1549,\r
-    "z": "f8944603.71553",\r
+    "x": 3540.566665649414,\r
+    "y": 1560,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "5c2f3801.4eed3"\r
+        "3eea4372.1c5814"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e12bcc6e.caae8",\r
+    "id": "662947db.2b96e8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3557.490966796875,\r
-    "y": 1591.5740356445312,\r
-    "z": "f8944603.71553",\r
+    "x": 3550.057632446289,\r
+    "y": 1602.5740356445312,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "fb3f4046.01bc4"\r
+        "f28295e0.d2c148"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a3a68564.d1334",\r
+    "id": "5677884d.d93c78",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3546,\r
-    "y": 1638,\r
-    "z": "f8944603.71553",\r
+    "x": 3538.566665649414,\r
+    "y": 1649,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9f68f9be.d7aab8"\r
+        "f900f622.22fda"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8a9b7f74.e3a568",\r
+    "id": "eddb7de7.123d5",\r
     "type": "comment",\r
     "name": "Question?",\r
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
     "comments": "",\r
-    "x": 3248,\r
-    "y": 1511,\r
-    "z": "f8944603.71553",\r
+    "x": 3240.566665649414,\r
+    "y": 1522,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "22efa8c9.c8576",\r
+    "id": "bd585daa.5b0d3",\r
     "type": "save",\r
     "name": "get p-interface-src from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3291,\r
-    "y": 1576,\r
-    "z": "f8944603.71553",\r
+    "x": 3283.566665649414,\r
+    "y": 1587,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "3464c217.ddf82e",\r
-        "e12bcc6e.caae8",\r
-        "a3a68564.d1334"\r
+        "6ca3f458.2d99d4",\r
+        "662947db.2b96e8",\r
+        "5677884d.d93c78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "55e39af5.a2b61c",\r
+    "id": "855375ef.856b78",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3292,\r
-    "y": 1246,\r
-    "z": "f8944603.71553",\r
+    "x": 3284.566665649414,\r
+    "y": 1257,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cbe70d53.b79168",\r
-        "9e0cb899.0e0f"\r
+        "74d070ad.2d8b38",\r
+        "f1856675.64f168"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9e0cb899.0e0f",\r
+    "id": "f1856675.64f168",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3512.999969482422,\r
-    "y": 1298.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3505.566635131836,\r
+    "y": 1309.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "300fab87.54654c"\r
+        "77f0bbcf.b75e0c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cbe70d53.b79168",\r
+    "id": "74d070ad.2d8b38",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3514.999969482422,\r
-    "y": 1331.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3507.566635131836,\r
+    "y": 1342.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ad0b83ff.4cb308"\r
+        "6e268d43.53f934"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5c2f3801.4eed3",\r
+    "id": "3eea4372.1c5814",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3720.66650390625,\r
-    "y": 1548,\r
-    "z": "f8944603.71553",\r
+    "x": 3713.233169555664,\r
+    "y": 1559,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "fe2c6692.47101",\r
-        "9af14a91.b12a68"\r
+        "f48e6ddf.17618",\r
+        "cc30c632.26f008"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fb3f4046.01bc4",\r
+    "id": "f28295e0.d2c148",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3711.0623779296875,\r
-    "y": 1594.8597717285156,\r
-    "z": "f8944603.71553",\r
+    "x": 3703.6290435791016,\r
+    "y": 1605.8597717285156,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9f68f9be.d7aab8",\r
+    "id": "f900f622.22fda",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3715,\r
-    "y": 1639,\r
-    "z": "f8944603.71553",\r
+    "x": 3707.566665649414,\r
+    "y": 1650,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fe2c6692.47101",\r
+    "id": "f48e6ddf.17618",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3985,\r
-    "y": 1532,\r
-    "z": "f8944603.71553",\r
+    "x": 3977.566665649414,\r
+    "y": 1543,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "37956c14.cf1964",\r
-        "7f26a273.a5f25c"\r
+        "c31fbd4a.4c152",\r
+        "ca57bc98.e008f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f26a273.a5f25c",\r
+    "id": "ca57bc98.e008f",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4208,\r
-    "y": 1487,\r
-    "z": "f8944603.71553",\r
+    "x": 4200.566665649414,\r
+    "y": 1498,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d180abab.fe69a"\r
+        "ae27226e.c1211"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "37956c14.cf1964",\r
+    "id": "c31fbd4a.4c152",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4210,\r
-    "y": 1551,\r
-    "z": "f8944603.71553",\r
+    "x": 4202.566665649414,\r
+    "y": 1562,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "11875f6b.e538c1"\r
+        "48b6888c.1688c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "11875f6b.e538c1",\r
+    "id": "48b6888c.1688c8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 4372,\r
-    "y": 1547,\r
-    "z": "f8944603.71553",\r
+    "x": 4364.566665649414,\r
+    "y": 1558,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d180abab.fe69a",\r
+    "id": "ae27226e.c1211",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4373,\r
-    "y": 1484,\r
-    "z": "f8944603.71553",\r
+    "x": 4365.566665649414,\r
+    "y": 1495,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "c42ee54d.ec9ea",\r
-        "e2dee17e.90746"\r
+        "dc9805ea.b1d968",\r
+        "e17a88a7.3a0c68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ad0b83ff.4cb308",\r
+    "id": "6e268d43.53f934",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 3657.999969482422,\r
-    "y": 1328.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3650.566635131836,\r
+    "y": 1339.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "300fab87.54654c",\r
+    "id": "77f0bbcf.b75e0c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3660.999969482422,\r
-    "y": 1291.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3653.566635131836,\r
+    "y": 1302.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "844bb618.6c32e8",\r
-        "99a55ff.3057da"\r
+        "6b41cb54.146c7c",\r
+        "2227088d.da8978"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "844bb618.6c32e8",\r
+    "id": "6b41cb54.146c7c",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",\r
     "comments": "",\r
-    "x": 3834.999969482422,\r
-    "y": 1247.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3827.566635131836,\r
+    "y": 1258.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9af14a91.b12a68",\r
+    "id": "cc30c632.26f008",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3933.999969482422,\r
-    "y": 1641.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3926.566635131836,\r
+    "y": 1652.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "1b19176e.822411"\r
+        "4c51d8d9.7e50e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1b19176e.822411",\r
+    "id": "4c51d8d9.7e50e",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4139.999969482422,\r
-    "y": 1641.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4132.566635131836,\r
+    "y": 1652.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "c875ac48.6e9"\r
+        "ea6dd5aa.f54cc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c875ac48.6e9",\r
+    "id": "ea6dd5aa.f54cc",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4355.285614013672,\r
-    "y": 1641.8217468261719,\r
-    "z": "f8944603.71553",\r
+    "x": 4347.852279663086,\r
+    "y": 1652.8217468261719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "6e0bf03.4de201"\r
+        "878f0a88.cc7f28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "99a55ff.3057da",\r
+    "id": "2227088d.da8978",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3849.999969482422,\r
-    "y": 1358.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3842.566635131836,\r
+    "y": 1369.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "26c5a31d.0e26c4",\r
-        "1dba38b8.e09647",\r
-        "703777cb.7523f"\r
+        "a1b22fed.dd46f",\r
+        "39006ff3.e4d42",\r
+        "90a88d63.a0deb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "26c5a31d.0e26c4",\r
+    "id": "a1b22fed.dd46f",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4045.5000915527344,\r
-    "y": 1310.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4038.0667572021484,\r
+    "y": 1321.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "3f157e84.d62172"\r
+        "11cc8b93.732e94"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1dba38b8.e09647",\r
+    "id": "39006ff3.e4d42",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4037.5000915527344,\r
-    "y": 1365.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4030.0667572021484,\r
+    "y": 1376.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7126adde.e76d1c"\r
+        "dc84c818.c1238"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "703777cb.7523f",\r
+    "id": "90a88d63.a0deb",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4042.5000915527344,\r
-    "y": 1422.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4035.0667572021484,\r
+    "y": 1433.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f85ce86b.434b48"\r
+        "5b4aec5c.78ea6c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f85ce86b.434b48",\r
+    "id": "5b4aec5c.78ea6c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4194.500091552734,\r
-    "y": 1423.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4187.066757202148,\r
+    "y": 1434.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7126adde.e76d1c",\r
+    "id": "dc84c818.c1238",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4205.500091552734,\r
-    "y": 1368.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4198.066757202148,\r
+    "y": 1379.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3f157e84.d62172",\r
+    "id": "11cc8b93.732e94",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4189.882415771484,\r
-    "y": 1308.6556396484375,\r
-    "z": "f8944603.71553",\r
+    "x": 4182.449081420898,\r
+    "y": 1319.6556396484375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "61a6617b.c1f918"\r
+        "3dd6ac8d.e6d824"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "61a6617b.c1f918",\r
+    "id": "3dd6ac8d.e6d824",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4373.999969482422,\r
-    "y": 1322.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4366.566635131836,\r
+    "y": 1333.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "c94ffafa.dcbd38"\r
+        "2c6d0561.1001da"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e2dee17e.90746",\r
+    "id": "e17a88a7.3a0c68",\r
     "type": "set",\r
     "name": "set ltpId",\r
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",\r
     "comments": "",\r
-    "x": 4543,\r
-    "y": 1442,\r
-    "z": "f8944603.71553",\r
+    "x": 4535.566665649414,\r
+    "y": 1453,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c42ee54d.ec9ea",\r
+    "id": "dc9805ea.b1d968",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",\r
     "comments": "",\r
-    "x": 4544,\r
-    "y": 1550,\r
-    "z": "f8944603.71553",\r
+    "x": 4536.566665649414,\r
+    "y": 1561,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a1e5e819.9ba388",\r
+    "id": "4eccdb3c.a00b8c",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
     "comments": "",\r
-    "x": 4545,\r
-    "y": 1499,\r
-    "z": "f8944603.71553",\r
+    "x": 4537.566665649414,\r
+    "y": 1510,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6e0bf03.4de201",\r
+    "id": "878f0a88.cc7f28",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4562.117156982422,\r
-    "y": 1642.3403015136719,\r
-    "z": "f8944603.71553",\r
+    "x": 4554.683822631836,\r
+    "y": 1653.3403015136719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "663b6226.995afc",\r
-        "dd7e9ff0.ed3a48",\r
-        "21e8d5ce.795f42"\r
+        "a6df4a7c.6d4298",\r
+        "e55c6491.d1cf5",\r
+        "7eb455b8.997c94"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "663b6226.995afc",\r
+    "id": "a6df4a7c.6d4298",\r
     "type": "set",\r
     "name": "set source ttp-id",\r
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 4777.117156982422,\r
-    "y": 1604.3403015136719,\r
-    "z": "f8944603.71553",\r
+    "x": 4769.683822631836,\r
+    "y": 1615.3403015136719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dd7e9ff0.ed3a48",\r
+    "id": "e55c6491.d1cf5",\r
     "type": "get-resource",\r
     "name": "get-resource src TTP",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4774.117156982422,\r
-    "y": 1643.3403015136719,\r
-    "z": "f8944603.71553",\r
+    "x": 4766.683822631836,\r
+    "y": 1654.3403015136719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "49a01492.84fe34"\r
+        "5121fcc7.d1555c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "21e8d5ce.795f42",\r
+    "id": "7eb455b8.997c94",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4729.617156982422,\r
-    "y": 1685.3403015136719,\r
-    "z": "f8944603.71553",\r
+    "x": 4722.183822631836,\r
+    "y": 1696.3403015136719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "49a01492.84fe34",\r
+    "id": "5121fcc7.d1555c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4954.617156982422,\r
-    "y": 1642.3403015136719,\r
-    "z": "f8944603.71553",\r
+    "x": 4947.183822631836,\r
+    "y": 1653.3403015136719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "292cacf5.882694"\r
+        "dcdffb31.a68748"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ccfcf164.268f1",\r
+    "id": "ee290dd7.3447b8",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4774,\r
-    "y": 1260,\r
-    "z": "f8944603.71553",\r
+    "x": 4766.566665649414,\r
+    "y": 1271,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "c88ef5fa.00d8b"\r
+        "f5c3f7a5.0472d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c88ef5fa.00d8b",\r
+    "id": "f5c3f7a5.0472d8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4951,\r
-    "y": 1252,\r
-    "z": "f8944603.71553",\r
+    "x": 4943.566665649414,\r
+    "y": 1263,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "889b0a64.f04af",\r
-        "b7b819bd.9ab3a"\r
+        "92327400.5b0ea",\r
+        "7dac197a.3be828"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c94ffafa.dcbd38",\r
+    "id": "2c6d0561.1001da",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4568.999969482422,\r
-    "y": 1322.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4561.566635131836,\r
+    "y": 1333.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ccfcf164.268f1",\r
-        "109fb904.331fef"\r
+        "ee290dd7.3447b8",\r
+        "97637af.969a388"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "109fb904.331fef",\r
+    "id": "97637af.969a388",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4777,\r
-    "y": 1334,\r
-    "z": "f8944603.71553",\r
+    "x": 4769.566665649414,\r
+    "y": 1345,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "c72b69fd.2d015"\r
+        "2b94ab82.f6af74"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c72b69fd.2d015",\r
+    "id": "2b94ab82.f6af74",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4954,\r
-    "y": 1326,\r
-    "z": "f8944603.71553",\r
+    "x": 4946.566665649414,\r
+    "y": 1337,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7fcaaf72.ffd618"\r
+        "a745e5da.a32578"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "292cacf5.882694",\r
+    "id": "dcdffb31.a68748",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5112.617156982422,\r
-    "y": 1642.3403015136719,\r
-    "z": "f8944603.71553",\r
+    "x": 5105.183822631836,\r
+    "y": 1653.3403015136719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "63e30873.d5c4b8"\r
+        "f0d23e06.a32c6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "63e30873.d5c4b8",\r
+    "id": "f0d23e06.a32c6",\r
     "type": "set",\r
     "name": "set source tunnel tp ip",\r
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",\r
     "comments": "",\r
-    "x": 5319.617156982422,\r
-    "y": 1642.3403015136719,\r
-    "z": "f8944603.71553",\r
+    "x": 5312.183822631836,\r
+    "y": 1653.3403015136719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b7b819bd.9ab3a",\r
+    "id": "7dac197a.3be828",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5159,\r
-    "y": 1259,\r
-    "z": "f8944603.71553",\r
+    "x": 5151.566665649414,\r
+    "y": 1270,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b062763c.d2a4c",\r
-        "54b52301.01aeac",\r
-        "c657b443.273d9"\r
+        "36ef2efb.214b2a",\r
+        "a6a3aa1c.6f7288",\r
+        "f4089fab.088a2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "889b0a64.f04af",\r
+    "id": "92327400.5b0ea",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainA id",\r
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5189,\r
-    "y": 1207,\r
-    "z": "f8944603.71553",\r
+    "x": 5181.566665649414,\r
+    "y": 1218,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b062763c.d2a4c",\r
+    "id": "36ef2efb.214b2a",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5369,\r
-    "y": 1250,\r
-    "z": "f8944603.71553",\r
+    "x": 5361.566665649414,\r
+    "y": 1261,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "be5642b7.4ae158"\r
+        "8d49602b.5cbbb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "54b52301.01aeac",\r
+    "id": "a6a3aa1c.6f7288",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5361,\r
-    "y": 1305,\r
-    "z": "f8944603.71553",\r
+    "x": 5353.566665649414,\r
+    "y": 1316,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "4c818fe4.79442"\r
+        "2502bb8.26e4744"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c657b443.273d9",\r
+    "id": "f4089fab.088a2",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5366,\r
-    "y": 1362,\r
-    "z": "f8944603.71553",\r
+    "x": 5358.566665649414,\r
+    "y": 1373,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "efb52045.6ba93"\r
+        "192598bd.b5d887"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "efb52045.6ba93",\r
+    "id": "192598bd.b5d887",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5518,\r
-    "y": 1363,\r
-    "z": "f8944603.71553",\r
+    "x": 5510.566665649414,\r
+    "y": 1374,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4c818fe4.79442",\r
+    "id": "2502bb8.26e4744",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5529,\r
-    "y": 1308,\r
-    "z": "f8944603.71553",\r
+    "x": 5521.566665649414,\r
+    "y": 1319,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "be5642b7.4ae158",\r
+    "id": "8d49602b.5cbbb8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5513.38232421875,\r
-    "y": 1247.6556701660156,\r
-    "z": "f8944603.71553",\r
+    "x": 5505.948989868164,\r
+    "y": 1258.6556701660156,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "6763b660.709548"\r
+        "34dd56c8.a561f2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7fcaaf72.ffd618",\r
+    "id": "a745e5da.a32578",\r
     "type": "set",\r
     "name": "set domainA ethernet layer network-id",\r
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5189,\r
-    "y": 1450,\r
-    "z": "f8944603.71553",\r
+    "x": 5181.566665649414,\r
+    "y": 1461,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6763b660.709548",\r
+    "id": "34dd56c8.a561f2",\r
     "type": "set",\r
     "name": "set controller domainA data",\r
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
     "comments": "",\r
-    "x": 5728,\r
-    "y": 1244,\r
-    "z": "f8944603.71553",\r
+    "x": 5720.566665649414,\r
+    "y": 1255,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1bc82fcd.e38b3",\r
+    "id": "9cc65469.2e5488",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4377.999969482422,\r
-    "y": 528.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4370.566635131836,\r
+    "y": 539.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1ea9819.2a7577e",\r
+    "id": "bae36160.d0fbc",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4368.999969482422,\r
-    "y": 626.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4361.566635131836,\r
+    "y": 637.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "86b880d.ad45d",\r
+    "id": "6429cd23.35e7c4",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4202.999969482422,\r
-    "y": 534.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4195.566635131836,\r
+    "y": 545.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "4ebe65d0.3ec92c",\r
-        "1bc82fcd.e38b3"\r
+        "d98ccbbe.37e04",\r
+        "9cc65469.2e5488"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "10eaea8a.998afd",\r
+    "id": "17c9fbf5.2a0a34",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4208.999969482422,\r
-    "y": 598.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4201.566635131836,\r
+    "y": 609.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b5b3e89e.18b28",\r
-        "1ea9819.2a7577e"\r
+        "449eb720.722948",\r
+        "bae36160.d0fbc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e84921e.f8ecce",\r
+    "id": "22d232ad.fa9d6e",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4227,\r
-    "y": 811,\r
-    "z": "f8944603.71553",\r
+    "x": 4219.566665649414,\r
+    "y": 822,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "81270995.5d712",\r
-        "aacd9933.603dc8"\r
+        "83bfbc5.ae6994",\r
+        "7c60504e.d38f7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b7ebf9b7.e2f348",\r
+    "id": "5c001c7.14606e4",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4230,\r
-    "y": 864,\r
-    "z": "f8944603.71553",\r
+    "x": 4222.566665649414,\r
+    "y": 875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7db54dd4.f36624",\r
-        "bffe7efa.872038"\r
+        "5244a859.c728e8",\r
+        "9835c9a0.4caf78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "aacd9933.603dc8",\r
+    "id": "7c60504e.d38f7",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4387,\r
-    "y": 824,\r
-    "z": "f8944603.71553",\r
+    "x": 4379.566665649414,\r
+    "y": 835,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bffe7efa.872038",\r
+    "id": "9835c9a0.4caf78",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4390,\r
-    "y": 915,\r
-    "z": "f8944603.71553",\r
+    "x": 4382.566665649414,\r
+    "y": 926,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "786dd6d1.bb9f",\r
+    "id": "c2220864.024798",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3681.999969482422,\r
-    "y": 2041.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3674.566635131836,\r
+    "y": 2052.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ced1d6e7.1761a",\r
-        "debfaec3.11449"\r
+        "b80ff39a.5788d",\r
+        "d5ffb970.fa1968"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4b469f00.bbd698",\r
+    "id": "db8ae4f9.347f",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3509.333465576172,\r
-    "y": 2042.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3501.900131225586,\r
+    "y": 2053.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "786dd6d1.bb9f"\r
+        "c2220864.024798"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "abe29976.f7b82",\r
+    "id": "4d1c7431.f53f04",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3518.824432373047,\r
-    "y": 2085.574005126953,\r
-    "z": "f8944603.71553",\r
+    "x": 3511.391098022461,\r
+    "y": 2096.574005126953,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "fd5b7bb5.9eb778"\r
+        "c720d68c.d6ef88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "df5e24e1.4bbfc8",\r
+    "id": "f027027b.1605f8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3507.333465576172,\r
-    "y": 2131.999969482422,\r
-    "z": "f8944603.71553",\r
+    "x": 3499.900131225586,\r
+    "y": 2142.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8efc96df.7aca9"\r
+        "174ecc35.cb4194"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fd5b7bb5.9eb778",\r
+    "id": "c720d68c.d6ef88",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3672.3958435058594,\r
-    "y": 2088.8597412109375,\r
-    "z": "f8944603.71553",\r
+    "x": 3664.9625091552734,\r
+    "y": 2099.8597412109375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8efc96df.7aca9",\r
+    "id": "174ecc35.cb4194",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3676.333465576172,\r
-    "y": 2132.999969482422,\r
-    "z": "f8944603.71553",\r
+    "x": 3668.900131225586,\r
+    "y": 2143.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ced1d6e7.1761a",\r
+    "id": "b80ff39a.5788d",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3968.333465576172,\r
-    "y": 2046.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 3960.900131225586,\r
+    "y": 2057.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8ff8205e.94493",\r
-        "d23599ca.696b88"\r
+        "f5a758df.e8e0d8",\r
+        "83d46017.2ef77"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d23599ca.696b88",\r
+    "id": "83d46017.2ef77",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4191.333465576172,\r
-    "y": 2001.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4183.900131225586,\r
+    "y": 2012.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9c58fe22.c1b4f8"\r
+        "128bbd7c.ee7803"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8ff8205e.94493",\r
+    "id": "f5a758df.e8e0d8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4193.333465576172,\r
-    "y": 2065.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4185.900131225586,\r
+    "y": 2076.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f9f53a1b.e6879"\r
+        "7922a686.9432f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f9f53a1b.e6879",\r
+    "id": "7922a686.9432f8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 4352.333465576172,\r
-    "y": 2084.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4344.900131225586,\r
+    "y": 2095.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9c58fe22.c1b4f8",\r
+    "id": "128bbd7c.ee7803",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4356.333465576172,\r
-    "y": 1998.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4348.900131225586,\r
+    "y": 2009.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "a3891ddf.35707",\r
-        "dedb2135.03f5b8"\r
+        "ecc94bdb.36f218",\r
+        "70d8643e.5fc584"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b18620c8.640928",\r
+    "id": "dd28e890.6f37f",\r
     "type": "save",\r
     "name": "get p-interface-dst from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3281.333465576172,\r
-    "y": 2077.999969482422,\r
-    "z": "f8944603.71553",\r
+    "x": 3273.900131225586,\r
+    "y": 2088.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "4b469f00.bbd698",\r
-        "abe29976.f7b82",\r
-        "df5e24e1.4bbfc8"\r
+        "db8ae4f9.347f",\r
+        "4d1c7431.f53f04",\r
+        "f027027b.1605f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2363f2d1.c22566",\r
+    "id": "6cb9de7.531902",\r
     "type": "comment",\r
     "name": "Question?",\r
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
     "comments": "",\r
-    "x": 3242.333465576172,\r
-    "y": 2021.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3234.900131225586,\r
+    "y": 2032.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d6e1611b.9ddcf",\r
+    "id": "d3754757.4f2538",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3301.333465576172,\r
-    "y": 1817.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3293.900131225586,\r
+    "y": 1828.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cf2f2f41.e3b378",\r
-        "39e668ff.f44578"\r
+        "c926dd8a.c40d78",\r
+        "b866a3cd.1307c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "39e668ff.f44578",\r
+    "id": "b866a3cd.1307c8",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3524.333465576172,\r
-    "y": 1803.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3516.900131225586,\r
+    "y": 1814.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "a19c910d.573ee"\r
+        "963b51c2.5c60a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cf2f2f41.e3b378",\r
+    "id": "c926dd8a.c40d78",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3526.333465576172,\r
-    "y": 1836.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3518.900131225586,\r
+    "y": 1847.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "13f310d4.058aff"\r
+        "288c4b3e.38e3ac"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "13f310d4.058aff",\r
+    "id": "288c4b3e.38e3ac",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 3669.333465576172,\r
-    "y": 1833.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3661.900131225586,\r
+    "y": 1844.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a19c910d.573ee",\r
+    "id": "963b51c2.5c60a8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3672.333465576172,\r
-    "y": 1796.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3664.900131225586,\r
+    "y": 1807.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f7d74c47.1bc978",\r
-        "f5bac544.61fa48"\r
+        "dba238c.ade58c8",\r
+        "11c5499c.e33516"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f7d74c47.1bc978",\r
+    "id": "dba238c.ade58c8",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",\r
     "comments": "",\r
-    "x": 3866.333465576172,\r
-    "y": 1800.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 3858.900131225586,\r
+    "y": 1811.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "debfaec3.11449",\r
+    "id": "d5ffb970.fa1968",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3919.3334350585938,\r
-    "y": 2168.9999389648438,\r
-    "z": "f8944603.71553",\r
+    "x": 3911.900100708008,\r
+    "y": 2179.9999389648438,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9615e6c.711fd18"\r
+        "8ab0c323.e760e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9615e6c.711fd18",\r
+    "id": "8ab0c323.e760e",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4125.333435058594,\r
-    "y": 2168.9999389648438,\r
-    "z": "f8944603.71553",\r
+    "x": 4117.900100708008,\r
+    "y": 2179.9999389648438,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cbe4341f.004078"\r
+        "ef601430.2ce96"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cbe4341f.004078",\r
+    "id": "ef601430.2ce96",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4342.619079589844,\r
-    "y": 2167.8217163085938,\r
-    "z": "f8944603.71553",\r
+    "x": 4335.185745239258,\r
+    "y": 2178.8217163085938,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "c7f950c4.309208"\r
+        "e64538ad.e88608"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5bac544.61fa48",\r
+    "id": "11c5499c.e33516",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3888.333465576172,\r
-    "y": 1868.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 3880.900131225586,\r
+    "y": 1879.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "2c3b0cc0.e9a8bc",\r
-        "964d0d68.ea7238",\r
-        "c9fecb15.92dc4"\r
+        "72da73e.01fae8c",\r
+        "1bf4f20c.844916",\r
+        "c2abc766.4ac0f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c3b0cc0.e9a8bc",\r
+    "id": "72da73e.01fae8c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4083.8335876464844,\r
-    "y": 1820.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4076.4002532958984,\r
+    "y": 1831.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d8e08a6a.bad6c"\r
+        "e5dd1f31.8ac458"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "964d0d68.ea7238",\r
+    "id": "1bf4f20c.844916",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4075.8335876464844,\r
-    "y": 1875.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4068.4002532958984,\r
+    "y": 1886.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "30330606.c5c78a"\r
+        "2c7c5a6c.8f4a66"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c9fecb15.92dc4",\r
+    "id": "c2abc766.4ac0f",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4080.8335876464844,\r
-    "y": 1932.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4073.4002532958984,\r
+    "y": 1943.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7d5217b1.764cf"\r
+        "a0f15b8e.a7ebb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7d5217b1.764cf",\r
+    "id": "a0f15b8e.a7ebb",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4232.833587646484,\r
-    "y": 1933.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4225.400253295898,\r
+    "y": 1944.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "30330606.c5c78a",\r
+    "id": "2c7c5a6c.8f4a66",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4243.833587646484,\r
-    "y": 1878.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4236.400253295898,\r
+    "y": 1889.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d8e08a6a.bad6c",\r
+    "id": "e5dd1f31.8ac458",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4228.215911865234,\r
-    "y": 1817.65576171875,\r
-    "z": "f8944603.71553",\r
+    "x": 4220.782577514648,\r
+    "y": 1828.65576171875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "57c065bf.a4bd5c"\r
+        "5bc7c506.3f7314"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a3891ddf.35707",\r
+    "id": "ecc94bdb.36f218",\r
     "type": "set",\r
     "name": "set ltpId",\r
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",\r
     "comments": "",\r
-    "x": 4526.333465576172,\r
-    "y": 1959.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4518.900131225586,\r
+    "y": 1970.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dedb2135.03f5b8",\r
+    "id": "70d8643e.5fc584",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
     "comments": "",\r
-    "x": 4527.333465576172,\r
-    "y": 2064.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4519.900131225586,\r
+    "y": 2075.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cd4b037.d584a",\r
+    "id": "75e052b3.6ff0fc",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
     "comments": "",\r
-    "x": 4522.333465576172,\r
-    "y": 2013.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4514.900131225586,\r
+    "y": 2024.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c7f950c4.309208",\r
+    "id": "e64538ad.e88608",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4549.450622558594,\r
-    "y": 2157.3403930664062,\r
-    "z": "f8944603.71553",\r
+    "x": 4542.017288208008,\r
+    "y": 2168.3403930664062,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "dd90bf13.7024b8",\r
-        "71302a26.8b2194",\r
-        "1d143619.b4c942"\r
+        "58b39a0b.a28104",\r
+        "908d048a.fd0138",\r
+        "5394d746.97415"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dd90bf13.7024b8",\r
+    "id": "58b39a0b.a28104",\r
     "type": "set",\r
     "name": "set destination ttp-id",\r
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 4764.450622558594,\r
-    "y": 2119.3403930664062,\r
-    "z": "f8944603.71553",\r
+    "x": 4757.017288208008,\r
+    "y": 2130.3403930664062,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "71302a26.8b2194",\r
+    "id": "908d048a.fd0138",\r
     "type": "get-resource",\r
     "name": "get-resource src TTP",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4761.450622558594,\r
-    "y": 2158.3403930664062,\r
-    "z": "f8944603.71553",\r
+    "x": 4754.017288208008,\r
+    "y": 2169.3403930664062,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d8986410.1ab67"\r
+        "160d9213.6a516e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1d143619.b4c942",\r
+    "id": "5394d746.97415",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4716.950622558594,\r
-    "y": 2200.3403930664062,\r
-    "z": "f8944603.71553",\r
+    "x": 4709.517288208008,\r
+    "y": 2211.3403930664062,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d8986410.1ab67",\r
+    "id": "160d9213.6a516e",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4941.950622558594,\r
-    "y": 2157.3403930664062,\r
-    "z": "f8944603.71553",\r
+    "x": 4934.517288208008,\r
+    "y": 2168.3403930664062,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ce977a1e.eca43"\r
+        "2403cbf1.90bae4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ce977a1e.eca43",\r
+    "id": "2403cbf1.90bae4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5099.950622558594,\r
-    "y": 2157.3403930664062,\r
-    "z": "f8944603.71553",\r
+    "x": 5092.517288208008,\r
+    "y": 2168.3403930664062,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "fad51809.c9b758"\r
+        "15dae2c1.fe6bdd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fad51809.c9b758",\r
+    "id": "15dae2c1.fe6bdd",\r
     "type": "set",\r
     "name": "set destination tunnel tp ip",\r
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",\r
     "comments": "",\r
-    "x": 5306.950622558594,\r
-    "y": 2157.3403930664062,\r
-    "z": "f8944603.71553",\r
+    "x": 5299.517288208008,\r
+    "y": 2168.3403930664062,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3e817052.af0e48",\r
+    "id": "e7ce121f.269bb",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4810.333465576172,\r
-    "y": 1836.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4802.900131225586,\r
+    "y": 1847.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "41d964fa.bed18c"\r
+        "30725ca7.222ea4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "41d964fa.bed18c",\r
+    "id": "30725ca7.222ea4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4987.333465576172,\r
-    "y": 1828.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4979.900131225586,\r
+    "y": 1839.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "286abe4.161a1c2",\r
-        "51859ea0.e5a788"\r
+        "82bc9190.99083",\r
+        "c6a75ef3.9aa488"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "57c065bf.a4bd5c",\r
+    "id": "5bc7c506.3f7314",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4412.333465576172,\r
-    "y": 1832.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4404.900131225586,\r
+    "y": 1843.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "89b46226.1281f"\r
+        "9e2fa3d8.88246"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "89b46226.1281f",\r
+    "id": "9e2fa3d8.88246",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4607.333465576172,\r
-    "y": 1832.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4599.900131225586,\r
+    "y": 1843.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "3e817052.af0e48",\r
-        "56bdf4f5.249c24"\r
+        "e7ce121f.269bb",\r
+        "87abf2c8.a21648"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "51859ea0.e5a788",\r
+    "id": "c6a75ef3.9aa488",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5195.333465576172,\r
-    "y": 1835.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 5187.900131225586,\r
+    "y": 1846.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d1ce3d2f.531928",\r
-        "ba2a8dba.a8d52",\r
-        "4ba192d1.030d84"\r
+        "d33681ca.12c55",\r
+        "54cfcb70.c20a5c",\r
+        "76901bc2.c646ec"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f8a3b14d.675a5",\r
+    "id": "c7485083.08e3d",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4989.333465576172,\r
-    "y": 1901.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4981.900131225586,\r
+    "y": 1912.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "25c16268.66f006"\r
+        "9f7ab33f.3d3ee8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "56bdf4f5.249c24",\r
+    "id": "87abf2c8.a21648",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4812.333465576172,\r
-    "y": 1909.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 4804.900131225586,\r
+    "y": 1920.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f8a3b14d.675a5"\r
+        "c7485083.08e3d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "286abe4.161a1c2",\r
+    "id": "82bc9190.99083",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainB id",\r
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5225.333465576172,\r
-    "y": 1783.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 5217.900131225586,\r
+    "y": 1794.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "25c16268.66f006",\r
+    "id": "9f7ab33f.3d3ee8",\r
     "type": "set",\r
     "name": "set domainB ethernet layer network-id",\r
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5224.333465576172,\r
-    "y": 2025.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 5216.900131225586,\r
+    "y": 2036.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d1ce3d2f.531928",\r
+    "id": "d33681ca.12c55",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5405.333465576172,\r
-    "y": 1826.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 5397.900131225586,\r
+    "y": 1837.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9d788655.20f98"\r
+        "52bdc174.53236"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ba2a8dba.a8d52",\r
+    "id": "54cfcb70.c20a5c",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5397.333465576172,\r
-    "y": 1881.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 5389.900131225586,\r
+    "y": 1892.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "96363bdc.091"\r
+        "da0362e9.7cf8b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4ba192d1.030d84",\r
+    "id": "76901bc2.c646ec",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5402.333465576172,\r
-    "y": 1938.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 5394.900131225586,\r
+    "y": 1949.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "6a0588e1.3fd2b8"\r
+        "656ad13e.13aaf8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6a0588e1.3fd2b8",\r
+    "id": "656ad13e.13aaf8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5554.333465576172,\r
-    "y": 1939.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 5546.900131225586,\r
+    "y": 1950.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "96363bdc.091",\r
+    "id": "da0362e9.7cf8b8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5565.333465576172,\r
-    "y": 1884.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 5557.900131225586,\r
+    "y": 1895.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9d788655.20f98",\r
+    "id": "52bdc174.53236",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5549.715789794922,\r
-    "y": 1823.65576171875,\r
-    "z": "f8944603.71553",\r
+    "x": 5542.282455444336,\r
+    "y": 1834.65576171875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f42174ac.a42b5"\r
+        "2dd4dc53.801b1c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f42174ac.a42b5",\r
+    "id": "2dd4dc53.801b1c",\r
     "type": "set",\r
     "name": "set controller domainB data",\r
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
     "comments": "",\r
-    "x": 5764.333465576172,\r
-    "y": 1820.0000915527344,\r
-    "z": "f8944603.71553",\r
+    "x": 5756.900131225586,\r
+    "y": 1831.0000915527344,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "11e0f934.faeab7",\r
+    "id": "10147ab3.fed6fd",\r
     "type": "set",\r
     "name": "set LEAF stuff",\r
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3248.999969482422,\r
-    "y": 1638.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3241.566635131836,\r
+    "y": 1649.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "87d62238.4ede38",\r
+    "id": "bb3da11a.4b756",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4544.999969482422,\r
-    "y": 612.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 4537.566635131836,\r
+    "y": 623.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "da6b2335.2cb2",\r
+    "id": "550747e5.fd6e4",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4555,\r
-    "y": 809,\r
-    "z": "f8944603.71553",\r
+    "x": 4547.566665649414,\r
+    "y": 820,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b71f57a7.e2a288",\r
+    "id": "425867c4.b0a9",\r
     "type": "set",\r
     "name": "set ROOT stuff",\r
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3251.9999389648438,\r
-    "y": 2146.9999389648438,\r
-    "z": "f8944603.71553",\r
+    "x": 3244.566604614258,\r
+    "y": 2157.9999389648438,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f7d11626.bd108",\r
+    "id": "e3e1a44c.9927b8",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3389,\r
-    "y": 2803,\r
-    "z": "f8944603.71553",\r
+    "x": 3381.566665649414,\r
+    "y": 2814,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7d22810d.66642",\r
+    "id": "4a62d4e.fca9aac",\r
     "type": "switchNode",\r
     "name": "switch found-middle-man?",\r
     "xml": "<switch test='`$found-middle-man`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3266,\r
-    "y": 2913,\r
-    "z": "f8944603.71553",\r
+    "x": 3258.566665649414,\r
+    "y": 2924,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "74458dfb.e82acc",\r
-        "6d43d493.c2ab14"\r
+        "81493f2.f26234",\r
+        "6c24115d.c6e7c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "74458dfb.e82acc",\r
+    "id": "81493f2.f26234",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3450,\r
-    "y": 2892,\r
-    "z": "f8944603.71553",\r
+    "x": 3442.566665649414,\r
+    "y": 2903,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "bd8c7362.5e86a8"\r
+        "3aff0eaf.ff7b7a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6d43d493.c2ab14",\r
+    "id": "6c24115d.c6e7c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3342,\r
-    "y": 5070,\r
-    "z": "f8944603.71553",\r
+    "x": 3334.566665649414,\r
+    "y": 5081,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f235a0e0.02a8"\r
+        "5bc4950a.db01dc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f235a0e0.02a8",\r
+    "id": "5bc4950a.db01dc",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3497,\r
-    "y": 5063,\r
-    "z": "f8944603.71553",\r
+    "x": 3489.566665649414,\r
+    "y": 5074,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "69d3ed18.577c3c",\r
-        "f2a7dc4a.68ede",\r
-        "a789852e.51cd48",\r
-        "434bd8c2.bae4f8",\r
-        "cd1fc06c.124968",\r
-        "c32fbe2a.4ce3f"\r
+        "2f2701b5.2dac16",\r
+        "316110e0.e54cc",\r
+        "b160de6d.e8ced8",\r
+        "595e7f4b.3b8bd8",\r
+        "8bf8bc6f.53ce6",\r
+        "1e2222c.7b917dd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bd8c7362.5e86a8",\r
+    "id": "3aff0eaf.ff7b7a",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3593,\r
-    "y": 2892,\r
-    "z": "f8944603.71553",\r
+    "x": 3585.566665649414,\r
+    "y": 2903,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "edf6563f.502118",\r
-        "59e68189.ade8e8",\r
-        "39d89d00.a48b3c",\r
-        "f51c657e.c3fcc8",\r
-        "3b5e2d55.c49c42",\r
-        "c40c923d.ffb318",\r
-        "3d1335ab.d13122",\r
-        "441ba30c.ae2a1c",\r
-        "5bfaebb4.b0d114",\r
-        "32f3c697.c51f22",\r
-        "f60b0d1b.343218",\r
-        "51fbee04.79f4f",\r
-        "a2a5771a.032e88",\r
-        "a39c337f.4b8598",\r
-        "f9369eb9.dd61b",\r
-        "dad20130.739d78",\r
-        "124ab46d.2d752c",\r
-        "fdfcc8c4.b3e8a8",\r
-        "8b9dcfa3.01c508",\r
-        "87dcb71b.a618f",\r
-        "286f0ec8.852352",\r
-        "2bbca6cc.0ec622"\r
+        "5168a07f.a36df8",\r
+        "6c599b75.a60fcc",\r
+        "35850a83.44a89e",\r
+        "ae160236.4157c8",\r
+        "b7fd9c88.558b98",\r
+        "6e041a0e.19b3cc",\r
+        "612f5852.aaa57",\r
+        "8d9898f5.dd7e",\r
+        "638e1104.d7c428",\r
+        "d797d3a4.8fe9",\r
+        "ce4e4e08.0ce56",\r
+        "a4cacc19.7d376",\r
+        "57e31ea9.c7173",\r
+        "bf6be8f0.fb6c88",\r
+        "982a1a56.4966b8",\r
+        "8feec705.936fd8",\r
+        "eb6eb29c.21a438",\r
+        "cad73781.1cf898",\r
+        "bdd8ea07.2740c",\r
+        "8877dbf4.9fef7",\r
+        "374b533b.d2c934",\r
+        "e008f489.a45f08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5bfaebb4.b0d114",\r
+    "id": "638e1104.d7c428",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainB",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3903,\r
-    "y": 3207,\r
-    "z": "f8944603.71553",\r
+    "x": 3895.566665649414,\r
+    "y": 3218,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "edf6563f.502118",\r
+    "id": "5168a07f.a36df8",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3851,\r
-    "y": 3249,\r
-    "z": "f8944603.71553",\r
+    "x": 3843.566665649414,\r
+    "y": 3260,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "59e68189.ade8e8",\r
+    "id": "6c599b75.a60fcc",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3980,\r
-    "y": 3291,\r
-    "z": "f8944603.71553",\r
+    "x": 3972.566665649414,\r
+    "y": 3302,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c425c4b.b5f8838",\r
+    "id": "e80dd6ae.f178",\r
     "type": "comment",\r
     "name": "Create ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3826,\r
-    "y": 3166,\r
-    "z": "f8944603.71553",\r
+    "x": 3818.566665649414,\r
+    "y": 3177,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "78e08e98.7c634",\r
+    "id": "b4b36e39.27fc08",\r
     "type": "comment",\r
     "name": "create middle man connectivity and ...",\r
     "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",\r
     "comments": "",\r
-    "x": 4351,\r
-    "y": 3687,\r
-    "z": "f8944603.71553",\r
+    "x": 4343.566665649414,\r
+    "y": 3698,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "39d89d00.a48b3c",\r
+    "id": "35850a83.44a89e",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity middle-man",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3915,\r
-    "y": 3726,\r
-    "z": "f8944603.71553",\r
+    "x": 3907.566665649414,\r
+    "y": 3737,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f51c657e.c3fcc8",\r
+    "id": "ae160236.4157c8",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3863,\r
-    "y": 3777,\r
-    "z": "f8944603.71553",\r
+    "x": 3855.566665649414,\r
+    "y": 3788,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3b5e2d55.c49c42",\r
+    "id": "b7fd9c88.558b98",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3999,\r
-    "y": 3824,\r
-    "z": "f8944603.71553",\r
+    "x": 3991.566665649414,\r
+    "y": 3835,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "62d7e2a.9cbc61c",\r
+    "id": "f07a7af4.49b438",\r
     "type": "comment",\r
     "name": "Create MIDDLE-MAN connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3856,\r
-    "y": 3686,\r
-    "z": "f8944603.71553",\r
+    "x": 3848.566665649414,\r
+    "y": 3697,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1f0597e7.f750d8",\r
+    "id": "d7c1d718.25aef8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4286,\r
-    "y": 3883,\r
-    "z": "f8944603.71553",\r
+    "x": 4278.566665649414,\r
+    "y": 3894,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c40c923d.ffb318",\r
+    "id": "6e041a0e.19b3cc",\r
     "type": "save",\r
     "name": "get middle-man connectivity from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3877,\r
-    "y": 3930,\r
-    "z": "f8944603.71553",\r
+    "x": 3869.566665649414,\r
+    "y": 3941,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b2dc6149.43ec28",\r
-        "f8c162ee.8e2a8",\r
-        "a8c36503.377908"\r
+        "3be15b0.8cc9ea6",\r
+        "8fcafedd.8f9ff8",\r
+        "74f3c2d6.5194d4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b2dc6149.43ec28",\r
+    "id": "3be15b0.8cc9ea6",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4124,\r
-    "y": 3884,\r
-    "z": "f8944603.71553",\r
+    "x": 4116.566665649414,\r
+    "y": 3895,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "1f0597e7.f750d8"\r
+        "d7c1d718.25aef8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f8c162ee.8e2a8",\r
+    "id": "8fcafedd.8f9ff8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4124.490966796875,\r
-    "y": 3929.5740356445312,\r
-    "z": "f8944603.71553",\r
+    "x": 4117.057632446289,\r
+    "y": 3940.5740356445312,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "244505cb.7c97da"\r
+        "535b8241.bba134"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a8c36503.377908",\r
+    "id": "74f3c2d6.5194d4",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4122,\r
-    "y": 3973,\r
-    "z": "f8944603.71553",\r
+    "x": 4114.566665649414,\r
+    "y": 3984,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "fac0a6c3.57a578"\r
+        "4abd8099.5640c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "244505cb.7c97da",\r
+    "id": "535b8241.bba134",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4287.0623779296875,\r
-    "y": 3929.8597717285156,\r
-    "z": "f8944603.71553",\r
+    "x": 4279.629043579102,\r
+    "y": 3940.8597717285156,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fac0a6c3.57a578",\r
+    "id": "4abd8099.5640c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 4291,\r
-    "y": 3974,\r
-    "z": "f8944603.71553",\r
+    "x": 4283.566665649414,\r
+    "y": 3985,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f9369eb9.dd61b",\r
+    "id": "982a1a56.4966b8",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3931,\r
-    "y": 4272,\r
-    "z": "f8944603.71553",\r
+    "x": 3923.566665649414,\r
+    "y": 4283,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "dad20130.739d78",\r
+    "id": "8feec705.936fd8",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3934,\r
-    "y": 4317,\r
-    "z": "f8944603.71553",\r
+    "x": 3926.566665649414,\r
+    "y": 4328,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fdfcc8c4.b3e8a8",\r
+    "id": "cad73781.1cf898",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3926,\r
-    "y": 4045,\r
-    "z": "f8944603.71553",\r
+    "x": 3918.566665649414,\r
+    "y": 4056,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8b9dcfa3.01c508",\r
+    "id": "bdd8ea07.2740c",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3928,\r
-    "y": 4092,\r
-    "z": "f8944603.71553",\r
+    "x": 3920.566665649414,\r
+    "y": 4103,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ed841a30.7664d",\r
+    "id": "b21853e4.c6418",\r
     "type": "comment",\r
     "name": "The following two will be done in F1",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3847,\r
-    "y": 4225,\r
-    "z": "f8944603.71553",\r
+    "x": 3839.566665649414,\r
+    "y": 4236,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7144ff5f.c519e8",\r
+    "id": "f1842c11.743b7",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4457,\r
-    "y": 4891,\r
-    "z": "f8944603.71553",\r
+    "x": 4449.566665649414,\r
+    "y": 4902,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "69d3ed18.577c3c",\r
+    "id": "2f2701b5.2dac16",\r
     "type": "switchNode",\r
     "name": "switch no-pce-call",\r
     "xml": "<switch test='`$no-pce-call`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3712,\r
-    "y": 5044,\r
-    "z": "f8944603.71553",\r
+    "x": 3704.566665649414,\r
+    "y": 5055,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ae7574f4.3ebe3",\r
-        "8bd2d4fd.8c4f1"\r
+        "bb4138b0.4e1d88",\r
+        "3497566e.93319a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8bd2d4fd.8c4f1",\r
+    "id": "3497566e.93319a",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3884,\r
-    "y": 5041,\r
-    "z": "f8944603.71553",\r
+    "x": 3876.566665649414,\r
+    "y": 5052,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "439959aa.a8d0e"\r
+        "c7f4755e.39d608"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ae7574f4.3ebe3",\r
+    "id": "bb4138b0.4e1d88",\r
     "type": "outcomeFalse",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3836,\r
-    "y": 5888,\r
-    "z": "f8944603.71553",\r
+    "x": 3828.566665649414,\r
+    "y": 5899,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b05d129.ef1b1f"\r
+        "6c4c0ada.7452e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bbd89123.3c84c8",\r
+    "id": "4c3530ee.3fa66",\r
     "type": "comment",\r
     "name": "1 --> PCE is needed",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3897,\r
-    "y": 5011,\r
-    "z": "f8944603.71553",\r
+    "x": 3889.566665649414,\r
+    "y": 5022,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "88e636e4.0ad278",\r
+    "id": "56d0be77.8f738",\r
     "type": "comment",\r
     "name": "2 --> no need to call PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3907,\r
-    "y": 5846,\r
-    "z": "f8944603.71553",\r
+    "x": 3899.566665649414,\r
+    "y": 5857,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3d1335ab.d13122",\r
+    "id": "612f5852.aaa57",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3930,\r
-    "y": 4420,\r
-    "z": "f8944603.71553",\r
+    "x": 3922.566665649414,\r
+    "y": 4431,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "439959aa.a8d0e",\r
+    "id": "c7f4755e.39d608",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4060,\r
-    "y": 5043,\r
-    "z": "f8944603.71553",\r
+    "x": 4052.566665649414,\r
+    "y": 5054,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "398ca5b9.10ae92",\r
-        "26315d76.5ba5da",\r
-        "70413194.4e4218",\r
-        "36f7b692.fe5f9a",\r
-        "23762b83.94d65c",\r
-        "1981b041.f96778",\r
-        "7144ff5f.c519e8",\r
-        "d1a4e2c9.15ac9",\r
-        "24040f90.d6a4"\r
+        "230e1b13.237ccc",\r
+        "5181bb49.6fa9a4",\r
+        "fd0048f2.8665c8",\r
+        "78647ab5.49b354",\r
+        "f0982e54.06c37",\r
+        "828e934c.bce518",\r
+        "f1842c11.743b7",\r
+        "76d94500.85b34c",\r
+        "66bf889f.a4f118"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9b6d23e8.2f4c1",\r
+    "id": "ae961dcf.a0b6c",\r
     "type": "comment",\r
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5505,\r
-    "y": 4516,\r
-    "z": "f8944603.71553",\r
+    "x": 5497.566665649414,\r
+    "y": 4527,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "398ca5b9.10ae92",\r
+    "id": "230e1b13.237ccc",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4438,\r
-    "y": 5546,\r
-    "z": "f8944603.71553",\r
+    "x": 4430.566665649414,\r
+    "y": 5557,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "441ba30c.ae2a1c",\r
+    "id": "8d9898f5.dd7e",\r
     "type": "save",\r
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3909,\r
-    "y": 3420,\r
-    "z": "f8944603.71553",\r
+    "x": 3901.566665649414,\r
+    "y": 3431,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "32f3c697.c51f22",\r
+    "id": "d797d3a4.8fe9",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainA",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3907,\r
-    "y": 2877,\r
-    "z": "f8944603.71553",\r
+    "x": 3899.566665649414,\r
+    "y": 2888,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f60b0d1b.343218",\r
+    "id": "ce4e4e08.0ce56",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3855,\r
-    "y": 2925,\r
-    "z": "f8944603.71553",\r
+    "x": 3847.566665649414,\r
+    "y": 2936,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "51fbee04.79f4f",\r
+    "id": "a4cacc19.7d376",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3983,\r
-    "y": 2972,\r
-    "z": "f8944603.71553",\r
+    "x": 3975.566665649414,\r
+    "y": 2983,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f3326814.1ece9",\r
+    "id": "ae968df.974b9f",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3820,\r
-    "y": 2835,\r
-    "z": "f8944603.71553",\r
+    "x": 3812.566665649414,\r
+    "y": 2846,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a2a5771a.032e88",\r
+    "id": "57e31ea9.c7173",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "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`' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3817,\r
-    "y": 3063,\r
-    "z": "f8944603.71553",\r
+    "x": 3809.566665649414,\r
+    "y": 3074,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a39c337f.4b8598",\r
+    "id": "bf6be8f0.fb6c88",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3910,\r
-    "y": 3116,\r
-    "z": "f8944603.71553",\r
+    "x": 3902.566665649414,\r
+    "y": 3127,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "71641615.6f44c8",\r
+    "id": "155d8942.126f0f",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3801,\r
-    "y": 3019,\r
-    "z": "f8944603.71553",\r
+    "x": 3793.566665649414,\r
+    "y": 3030,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "11067d29.f83e4b",\r
+    "id": "eda430a0.e8a4b8",\r
     "type": "comment",\r
     "name": "Create ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3805,\r
-    "y": 3335,\r
-    "z": "f8944603.71553",\r
+    "x": 3797.566665649414,\r
+    "y": 3346,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "36f7b692.fe5f9a",\r
+    "id": "78647ab5.49b354",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4374,\r
-    "y": 4524,\r
-    "z": "f8944603.71553",\r
+    "x": 4366.566665649414,\r
+    "y": 4535,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fa6ec7f0.b5b858",\r
+    "id": "db99df8c.8021",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4358,\r
-    "y": 4480,\r
-    "z": "f8944603.71553",\r
+    "x": 4350.566665649414,\r
+    "y": 4491,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "87e40dc2.3dae2",\r
+    "id": "fea8fd97.74e2c8",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5105,\r
-    "y": 4511,\r
-    "z": "f8944603.71553",\r
+    "x": 5097.566665649414,\r
+    "y": 4522,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a4406b4c.17bbc",\r
+    "id": "5a0b429f.b8f42c",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainA",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5192,\r
-    "y": 4553,\r
-    "z": "f8944603.71553",\r
+    "x": 5184.566665649414,\r
+    "y": 4564,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "18ca4a3.634f536",\r
+    "id": "5930a956.25a2b",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5140,\r
-    "y": 4601,\r
-    "z": "f8944603.71553",\r
+    "x": 5132.566665649414,\r
+    "y": 4612,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b4f57662.21d798",\r
+    "id": "8f7ba394.827068",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5268,\r
-    "y": 4648,\r
-    "z": "f8944603.71553",\r
+    "x": 5260.566665649414,\r
+    "y": 4659,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1981b041.f96778",\r
+    "id": "828e934c.bce518",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4445,\r
-    "y": 4933,\r
-    "z": "f8944603.71553",\r
+    "x": 4437.566665649414,\r
+    "y": 4944,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1ff0ab3b.554fd5",\r
+    "id": "29a2a107.550e86",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4428,\r
-    "y": 4995,\r
-    "z": "f8944603.71553",\r
+    "x": 4420.566665649414,\r
+    "y": 5006,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "26315d76.5ba5da",\r
+    "id": "5181bb49.6fa9a4",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4539,\r
-    "y": 5037,\r
-    "z": "f8944603.71553",\r
+    "x": 4531.566665649414,\r
+    "y": 5048,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "99476299.d65948",\r
+    "id": "a3e1b718.3ad9",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 4987,\r
-    "y": 5090,\r
-    "z": "f8944603.71553",\r
+    "x": 4979.566665649414,\r
+    "y": 5101,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7e1b41de.44cf5",\r
+    "id": "778aa80b.aa4e1",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4297,\r
-    "y": 5788,\r
-    "z": "f8944603.71553",\r
+    "x": 4289.566665649414,\r
+    "y": 5799,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "99207b39.65e8d8",\r
+    "id": "5829dcc0.7722b4",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4195,\r
-    "y": 5737,\r
-    "z": "f8944603.71553",\r
+    "x": 4187.566665649414,\r
+    "y": 5748,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fc9d3b48.0b961",\r
+    "id": "e74f47d7.82472",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4179,\r
-    "y": 5693,\r
-    "z": "f8944603.71553",\r
+    "x": 4171.566665649414,\r
+    "y": 5704,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cdbca407.a3714",\r
+    "id": "edf4200a.b4f218",\r
     "type": "save",\r
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4965,\r
-    "y": 5950,\r
-    "z": "f8944603.71553",\r
+    "x": 4957.566665649414,\r
+    "y": 5961,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "70413194.4e4218",\r
+    "id": "fd0048f2.8665c8",\r
     "type": "switchNode",\r
     "name": "switch found-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4366,\r
-    "y": 5094,\r
-    "z": "f8944603.71553",\r
+    "x": 4358.566665649414,\r
+    "y": 5105,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9e68e3f9.d79778",\r
-        "3f3ed24c.0decee"\r
+        "ad0bda8.59e5ba8",\r
+        "a82a76f3.4e09c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9e68e3f9.d79778",\r
+    "id": "ad0bda8.59e5ba8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4577,\r
-    "y": 5094,\r
-    "z": "f8944603.71553",\r
+    "x": 4569.566665649414,\r
+    "y": 5105,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e924e4da.1f13b"\r
+        "85a5596f.5bdcf8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e924e4da.1f13b",\r
+    "id": "85a5596f.5bdcf8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4733,\r
-    "y": 5090,\r
-    "z": "f8944603.71553",\r
+    "x": 4725.566665649414,\r
+    "y": 5101,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "99476299.d65948",\r
-        "259aff1b.d97a1",\r
-        "b61f1c95.4694d"\r
+        "a3e1b718.3ad9",\r
+        "31466e0d.9a3dba",\r
+        "19c788e0.a62557"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3f3ed24c.0decee",\r
+    "id": "a82a76f3.4e09c",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4573,\r
-    "y": 5142,\r
-    "z": "f8944603.71553",\r
+    "x": 4565.566665649414,\r
+    "y": 5153,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "6bc2c49e.5247fc"\r
+        "9fc5ee1f.667928"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6bc2c49e.5247fc",\r
+    "id": "9fc5ee1f.667928",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
     "comments": "",\r
-    "x": 4721,\r
-    "y": 5137,\r
-    "z": "f8944603.71553",\r
+    "x": 4713.566665649414,\r
+    "y": 5148,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "540d81b.ac8608",\r
+    "id": "4161f07f.2b4a78",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5229,\r
-    "y": 4719,\r
-    "z": "f8944603.71553",\r
+    "x": 5221.566665649414,\r
+    "y": 4730,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e8527008.db6228",\r
+    "id": "90827cac.7f3cc8",\r
     "type": "execute",\r
     "name": "execute UUID generator for ethernet-service-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2395,\r
-    "y": 130,\r
-    "z": "f8944603.71553",\r
+    "x": 2387.566665649414,\r
+    "y": 141,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a669b945.663408",\r
+    "id": "e557ce2.09f823",\r
     "type": "set",\r
     "name": "set new ethernet-service-name",\r
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 2329,\r
-    "y": 166,\r
-    "z": "f8944603.71553",\r
+    "x": 2321.566665649414,\r
+    "y": 177,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ba20200a.599368",\r
+    "id": "47435c42.bdd92c",\r
     "type": "comment",\r
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",\r
     "info": "",\r
     "comments": "",\r
-    "x": 2514,\r
-    "y": 93,\r
-    "z": "f8944603.71553",\r
+    "x": 2506.566665649414,\r
+    "y": 104,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f5cafc97.3be338",\r
+    "id": "b6d8895e.58d1b",\r
     "type": "set",\r
     "name": "set current-provider-id and current-cvlan-id",\r
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",\r
     "comments": "",\r
-    "x": 4264,\r
-    "y": 5854,\r
-    "z": "f8944603.71553",\r
+    "x": 4256.566665649414,\r
+    "y": 5865,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "433677c1.52ee48",\r
+    "id": "c1456abb.063048",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4397,\r
-    "y": 5902,\r
-    "z": "f8944603.71553",\r
+    "x": 4389.566665649414,\r
+    "y": 5913,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fabf4cab.b217e",\r
+    "id": "da4c1b48.fae9f8",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4216,\r
-    "y": 5960,\r
-    "z": "f8944603.71553",\r
+    "x": 4208.566665649414,\r
+    "y": 5971,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d58843e6.45b67",\r
-        "5480ce12.618198"\r
+        "86ae7c06.4b48",\r
+        "7bcdf21f.be49d4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d58843e6.45b67",\r
+    "id": "86ae7c06.4b48",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4409,\r
-    "y": 5961,\r
-    "z": "f8944603.71553",\r
+    "x": 4401.566665649414,\r
+    "y": 5972,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "3584d606.ea3b92"\r
+        "97f7b4f.de4c2c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3584d606.ea3b92",\r
+    "id": "97f7b4f.de4c2c8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",\r
     "comments": "",\r
-    "x": 4565,\r
-    "y": 5958,\r
-    "z": "f8944603.71553",\r
+    "x": 4557.566665649414,\r
+    "y": 5969,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5480ce12.618198",\r
+    "id": "7bcdf21f.be49d4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4413,\r
-    "y": 6005,\r
-    "z": "f8944603.71553",\r
+    "x": 4405.566665649414,\r
+    "y": 6016,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "2c5800b.fe6138"\r
+        "c9f63d74.2677a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c5800b.fe6138",\r
+    "id": "c9f63d74.2677a",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4552,\r
-    "y": 6000,\r
-    "z": "f8944603.71553",\r
+    "x": 4544.566665649414,\r
+    "y": 6011,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cdbca407.a3714",\r
-        "908326bd.db0de8",\r
-        "252b791f.9db75e",\r
-        "275b22ee.4a806e",\r
-        "331c47e0.bff598",\r
-        "cf9d9601.e8d088",\r
-        "b92b2881.bc3e18",\r
-        "19e51740.b8f8a1",\r
-        "2ded21f8.219046",\r
-        "a0a762d0.469c28",\r
-        "60c16c76.a98d34",\r
-        "8396080f.a7f6c8"\r
+        "edf4200a.b4f218",\r
+        "684d5c9e.960e44",\r
+        "fa17bed2.102338",\r
+        "4394fc56.b0a524",\r
+        "c58358a8.9796d8",\r
+        "f1d05d51.ef74a8",\r
+        "9dd9cb2c.0f6d38",\r
+        "e3b520b5.76f3e",\r
+        "1492db48.4787f5",\r
+        "4433eaac.652284",\r
+        "5e482e7e.e4be78",\r
+        "b03c5831.d4c5f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b92b2881.bc3e18",\r
+    "id": "9dd9cb2c.0f6d38",\r
     "type": "save",\r
     "name": "get all-vpn-bindings from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4749,\r
-    "y": 6679,\r
-    "z": "f8944603.71553",\r
+    "x": 4741.566665649414,\r
+    "y": 6690,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b068e9a3.d4db4",\r
-        "b79debc6.f268c",\r
-        "599f79e1.6940a8"\r
+        "1b9180c4.9f766f",\r
+        "3223a99b.bae36e",\r
+        "f1d0a095.e9e33"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b068e9a3.d4db4",\r
+    "id": "1b9180c4.9f766f",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4954,\r
-    "y": 6676,\r
-    "z": "f8944603.71553",\r
+    "x": 4946.566665649414,\r
+    "y": 6687,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "be7eb0d3.672b2"\r
+        "901d20b6.63b228"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b79debc6.f268c",\r
+    "id": "3223a99b.bae36e",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4937.490966796875,\r
-    "y": 6737.574035644531,\r
-    "z": "f8944603.71553",\r
+    "x": 4930.057632446289,\r
+    "y": 6748.574035644531,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7384abca.e83424"\r
+        "74136956.3d8c9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "599f79e1.6940a8",\r
+    "id": "f1d0a095.e9e33",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4935,\r
-    "y": 6781,\r
-    "z": "f8944603.71553",\r
+    "x": 4927.566665649414,\r
+    "y": 6792,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "5c72f79d.0cafa"\r
+        "c0df29cc.8ad0d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be7eb0d3.672b2",\r
+    "id": "901d20b6.63b228",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5110,\r
-    "y": 6690,\r
-    "z": "f8944603.71553",\r
+    "x": 5102.566665649414,\r
+    "y": 6701,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "477f7936.afbf38"\r
+        "1ef77bcc.af8c2c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7384abca.e83424",\r
+    "id": "74136956.3d8c9",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5100.0623779296875,\r
-    "y": 6737.859771728516,\r
-    "z": "f8944603.71553",\r
+    "x": 5092.629043579102,\r
+    "y": 6748.859771728516,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5c72f79d.0cafa",\r
+    "id": "c0df29cc.8ad0d8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 5102,\r
-    "y": 6780,\r
-    "z": "f8944603.71553",\r
+    "x": 5094.566665649414,\r
+    "y": 6791,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "477f7936.afbf38",\r
+    "id": "1ef77bcc.af8c2c",\r
     "type": "for",\r
     "name": "for vpnidx in all-vpn-bindings",\r
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5357,\r
-    "y": 6687,\r
-    "z": "f8944603.71553",\r
+    "x": 5349.566665649414,\r
+    "y": 6698,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8d0d8dd8.5dff18"\r
+        "77c4c783.c3eb4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8d0d8dd8.5dff18",\r
+    "id": "77c4c783.c3eb4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5594,\r
-    "y": 6683,\r
-    "z": "f8944603.71553",\r
+    "x": 5586.566665649414,\r
+    "y": 6694,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "234239f1.092ec6"\r
+        "aa349c90.ef423"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af0f93b9.f63018",\r
+    "id": "41bd4d7e.8e8f9c",\r
     "type": "switchNode",\r
     "name": "switch vpnuuid is for this slice",\r
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5837,\r
-    "y": 6655,\r
-    "z": "f8944603.71553",\r
+    "x": 5829.566665649414,\r
+    "y": 6666,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "1906307e.4f6708",\r
-        "7e26fbb1.9c733c"\r
+        "858dc053.37b33",\r
+        "5e74f51.5b7928c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1906307e.4f6708",\r
+    "id": "858dc053.37b33",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6042,\r
-    "y": 6675,\r
-    "z": "f8944603.71553",\r
+    "x": 6034.566665649414,\r
+    "y": 6686,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "234239f1.092ec6"\r
+        "aa349c90.ef423"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7e26fbb1.9c733c",\r
+    "id": "5e74f51.5b7928c",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6041,\r
-    "y": 6628,\r
-    "z": "f8944603.71553",\r
+    "x": 6033.566665649414,\r
+    "y": 6639,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "234239f1.092ec6",\r
+    "id": "aa349c90.ef423",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4785,\r
-    "y": 6950,\r
-    "z": "f8944603.71553",\r
+    "x": 4777.566665649414,\r
+    "y": 6961,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9c243a63.6beae8"\r
+        "b674f90b.943ea8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7d275a16.b90c94",\r
+    "id": "4b6f312b.4e491",\r
     "type": "set",\r
     "name": "set tmp.aai.the-vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
     "comments": "",\r
-    "x": 6246.999969482422,\r
-    "y": 6887.999969482422,\r
-    "z": "f8944603.71553",\r
+    "x": 6239.566635131836,\r
+    "y": 6898.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "62c83b20.7bb344",\r
+    "id": "e9dae4fe.64e148",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4847,\r
-    "y": 6626,\r
-    "z": "f8944603.71553",\r
+    "x": 4839.566665649414,\r
+    "y": 6637,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cf9d9601.e8d088",\r
+    "id": "f1d05d51.ef74a8",\r
     "type": "set",\r
     "name": "set srcTtp OTN layer",\r
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4729,\r
-    "y": 6514,\r
-    "z": "f8944603.71553",\r
+    "x": 4721.566665649414,\r
+    "y": 6525,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fb325d12.16a73",\r
+    "id": "87a0032d.5441b8",\r
     "type": "switchNode",\r
     "name": "switch provider-id domainA",\r
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5074,\r
-    "y": 6345,\r
-    "z": "f8944603.71553",\r
+    "x": 5066.566665649414,\r
+    "y": 6356,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "2ae3447b.0a1c44"\r
+        "e7a622d1.3aac3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2ae3447b.0a1c44",\r
+    "id": "e7a622d1.3aac3",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5294,\r
-    "y": 6351,\r
-    "z": "f8944603.71553",\r
+    "x": 5286.566665649414,\r
+    "y": 6362,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "47fb23b1.c734fc"\r
+        "d7851175.526278"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "47fb23b1.c734fc",\r
+    "id": "d7851175.526278",\r
     "type": "switchNode",\r
     "name": "switch te-topo-id",\r
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5481,\r
-    "y": 6311,\r
-    "z": "f8944603.71553",\r
+    "x": 5473.566665649414,\r
+    "y": 6322,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "504a47cd.0300d8"\r
+        "56e3e30c.886de4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "504a47cd.0300d8",\r
+    "id": "56e3e30c.886de4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5673,\r
-    "y": 6314,\r
-    "z": "f8944603.71553",\r
+    "x": 5665.566665649414,\r
+    "y": 6325,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "70b7cd06.f487e4"\r
+        "c0a5fdcc.0dad4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "70b7cd06.f487e4",\r
+    "id": "c0a5fdcc.0dad4",\r
     "type": "set",\r
     "name": "set otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
     "comments": "",\r
-    "x": 5882,\r
-    "y": 6312,\r
-    "z": "f8944603.71553",\r
+    "x": 5874.566665649414,\r
+    "y": 6323,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "19e51740.b8f8a1",\r
+    "id": "e3b520b5.76f3e",\r
     "type": "for",\r
     "name": "for netwidx..allNetworksList_length",\r
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4781,\r
-    "y": 6339,\r
-    "z": "f8944603.71553",\r
+    "x": 4773.566665649414,\r
+    "y": 6350,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "fb325d12.16a73"\r
+        "87a0032d.5441b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "252b791f.9db75e",\r
+    "id": "fa17bed2.102338",\r
     "type": "get-resource",\r
     "name": "get-resource network-resources-list",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4789,\r
-    "y": 6232,\r
-    "z": "f8944603.71553",\r
+    "x": 4781.566665649414,\r
+    "y": 6243,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ab2e0e9b.e6e2a",\r
-        "175d6a26.e8f2ae",\r
-        "30472c6d.7bfeec"\r
+        "b854c35b.ab4dd8",\r
+        "6917c22f.3449c4",\r
+        "56393d6a.f28b34"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ab2e0e9b.e6e2a",\r
+    "id": "b854c35b.ab4dd8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5025,\r
-    "y": 6215,\r
-    "z": "f8944603.71553",\r
+    "x": 5017.566665649414,\r
+    "y": 6226,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "175d6a26.e8f2ae",\r
+    "id": "6917c22f.3449c4",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5022,\r
-    "y": 6256,\r
-    "z": "f8944603.71553",\r
+    "x": 5014.566665649414,\r
+    "y": 6267,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "30472c6d.7bfeec",\r
+    "id": "56393d6a.f28b34",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5036,\r
-    "y": 6296,\r
-    "z": "f8944603.71553",\r
+    "x": 5028.566665649414,\r
+    "y": 6307,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "275b22ee.4a806e",\r
+    "id": "4394fc56.b0a524",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
     "comments": "",\r
-    "x": 4725,\r
-    "y": 6391,\r
-    "z": "f8944603.71553",\r
+    "x": 4717.566665649414,\r
+    "y": 6402,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "331c47e0.bff598",\r
+    "id": "c58358a8.9796d8",\r
     "type": "set",\r
     "name": "set tmp.pce-src-node",\r
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",\r
     "comments": "",\r
-    "x": 4733,\r
-    "y": 6449,\r
-    "z": "f8944603.71553",\r
+    "x": 4725.566665649414,\r
+    "y": 6460,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "908326bd.db0de8",\r
+    "id": "684d5c9e.960e44",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
     "comments": "",\r
-    "x": 4738,\r
-    "y": 6189,\r
-    "z": "f8944603.71553",\r
+    "x": 4730.566665649414,\r
+    "y": 6200,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8ef1afe7.71ad38",\r
+    "id": "4f9189d2.f34a8",\r
     "type": "comment",\r
     "name": "The following section is to find srcTtp OTN layer (its long name)",\r
     "info": "The following section is to find srcTtp OTN layer (its long name)",\r
     "comments": "",\r
-    "x": 4853,\r
-    "y": 6141,\r
-    "z": "f8944603.71553",\r
+    "x": 4845.566665649414,\r
+    "y": 6152,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9c243a63.6beae8",\r
+    "id": "b674f90b.943ea8",\r
     "type": "switchNode",\r
     "name": "switch ops-note is srcTtpOtnLayer",\r
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5028,\r
-    "y": 6947,\r
-    "z": "f8944603.71553",\r
+    "x": 5020.566665649414,\r
+    "y": 6958,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "14533561.0c5673",\r
-        "af779ea0.7fb81"\r
+        "f695cd31.082f9",\r
+        "a92f49c6.640148"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "14533561.0c5673",\r
+    "id": "f695cd31.082f9",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5257,\r
-    "y": 6924,\r
-    "z": "f8944603.71553",\r
+    "x": 5249.566665649414,\r
+    "y": 6935,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "55635f65.d76ee8"\r
+        "fe65cd53.d11278"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af779ea0.7fb81",\r
+    "id": "a92f49c6.640148",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5257,\r
-    "y": 6973,\r
-    "z": "f8944603.71553",\r
+    "x": 5249.566665649414,\r
+    "y": 6984,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "494eed0f.99eb84",\r
+    "id": "8c69c55b.110248",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5989.999969482422,\r
-    "y": 6978.999969482422,\r
-    "z": "f8944603.71553",\r
+    "x": 5982.566635131836,\r
+    "y": 6989.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "6ed262af.6482c4",\r
-        "7d275a16.b90c94",\r
-        "ea085aad.03ece"\r
+        "aeda0706.1d102",\r
+        "4b6f312b.4e491",\r
+        "eebb4557.9c03c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb8bdae2.80aaf8",\r
+    "id": "ca7dd8b0.fcddf",\r
     "type": "comment",\r
     "name": "increase the bw of the-vpn-binding and change status to modified",\r
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 6374.999969482422,\r
-    "y": 6941.999969482422,\r
-    "z": "f8944603.71553",\r
+    "x": 6367.566635131836,\r
+    "y": 6952.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ea085aad.03ece",\r
+    "id": "eebb4557.9c03c",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6344.999969482422,\r
-    "y": 7001.999969482422,\r
-    "z": "f8944603.71553",\r
+    "x": 6337.566635131836,\r
+    "y": 7012.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6ed262af.6482c4",\r
+    "id": "aeda0706.1d102",\r
     "type": "set",\r
     "name": "unset tmp.aai.the-vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",\r
     "comments": "",\r
-    "x": 6251.999969482422,\r
-    "y": 6829.999969482422,\r
-    "z": "f8944603.71553",\r
+    "x": 6244.566635131836,\r
+    "y": 6840.999969482422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b05d129.ef1b1f",\r
+    "id": "6c4c0ada.7452e4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3988,\r
-    "y": 5887,\r
-    "z": "f8944603.71553",\r
+    "x": 3980.566665649414,\r
+    "y": 5898,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "99207b39.65e8d8",\r
-        "f5cafc97.3be338",\r
-        "433677c1.52ee48",\r
-        "fabf4cab.b217e",\r
-        "7e1b41de.44cf5"\r
+        "5829dcc0.7722b4",\r
+        "b6d8895e.58d1b",\r
+        "c1456abb.063048",\r
+        "da4c1b48.fae9f8",\r
+        "778aa80b.aa4e1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e2f1cfff.a8b258",\r
+    "id": "146e3d98.17031a",\r
     "type": "set",\r
     "name": "unset otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
     "comments": "",\r
-    "x": 4730,\r
-    "y": 6289,\r
-    "z": "f8944603.71553",\r
+    "x": 4722.566665649414,\r
+    "y": 6300,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2ded21f8.219046",\r
+    "id": "1492db48.4787f5",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4858,\r
-    "y": 6031,\r
-    "z": "f8944603.71553",\r
+    "x": 4850.566665649414,\r
+    "y": 6042,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4a18264c.6d9e",\r
+    "id": "cc643bc5.4660a",\r
     "type": "comment",\r
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "comments": "",\r
-    "x": 4995,\r
-    "y": 5981,\r
-    "z": "f8944603.71553",\r
+    "x": 4987.566665649414,\r
+    "y": 5992,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "124ab46d.2d752c",\r
+    "id": "eb6eb29c.21a438",\r
     "type": "save",\r
     "name": "save ROOT UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3822,\r
-    "y": 3374,\r
-    "z": "f8944603.71553",\r
+    "x": 3814.566665649414,\r
+    "y": 3385,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "826efc02.44c7b",\r
+    "id": "3ddb9817.a2345",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3999.999969482422,\r
-    "y": 1608.9999694824219,\r
-    "z": "f8944603.71553",\r
+    "x": 3992.566635131836,\r
+    "y": 1619.9999694824219,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3746cfac.cfad98",\r
+    "id": "87712f4d.617c48",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3978.9999389648438,\r
-    "y": 2120.9999389648438,\r
-    "z": "f8944603.71553",\r
+    "x": 3971.566604614258,\r
+    "y": 2131.9999389648438,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b5ea3d16.fd41f",\r
+    "id": "4a9500be.eb8d5",\r
     "type": "comment",\r
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3814,\r
-    "y": 3995,\r
-    "z": "f8944603.71553",\r
+    "x": 3806.566665649414,\r
+    "y": 4006,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9d7f2116.baeda",\r
+    "id": "1cb779c6.3641ce",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3904,\r
-    "y": 6375,\r
-    "z": "f8944603.71553",\r
+    "x": 3896.566665649414,\r
+    "y": 6386,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f2a7dc4a.68ede",\r
+    "id": "316110e0.e54cc",\r
     "type": "set",\r
     "name": "set current-provider-id and current-cvlan-id",\r
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",\r
     "comments": "",\r
-    "x": 3706,\r
-    "y": 4904,\r
-    "z": "f8944603.71553",\r
+    "x": 3698.566665649414,\r
+    "y": 4915,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a789852e.51cd48",\r
+    "id": "b160de6d.e8ced8",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3839,\r
-    "y": 4952,\r
-    "z": "f8944603.71553",\r
+    "x": 3831.566665649414,\r
+    "y": 4963,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "23762b83.94d65c",\r
+    "id": "f0982e54.06c37",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4385,\r
-    "y": 4580,\r
-    "z": "f8944603.71553",\r
+    "x": 4377.566665649414,\r
+    "y": 4591,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e4f34350.306628",\r
-        "84eda9bb.13e58"\r
+        "c8f13ad.170ba48",\r
+        "e5fec2af.744f18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e4f34350.306628",\r
+    "id": "c8f13ad.170ba48",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4578,\r
-    "y": 4581,\r
-    "z": "f8944603.71553",\r
+    "x": 4570.566665649414,\r
+    "y": 4592,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d93f9a59.274b5"\r
+        "7d8426b0.28b2e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "84eda9bb.13e58",\r
+    "id": "e5fec2af.744f18",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4582,\r
-    "y": 4625,\r
-    "z": "f8944603.71553",\r
+    "x": 4574.566665649414,\r
+    "y": 4636,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "fa8add54.9c2898"\r
+        "bbb62c5.19c455"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fa8add54.9c2898",\r
+    "id": "bbb62c5.19c455",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4721,\r
-    "y": 4620,\r
-    "z": "f8944603.71553",\r
+    "x": 4713.566665649414,\r
+    "y": 4631,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "48346123.4f10a8",\r
-        "5e210590.033b4c",\r
-        "140ccb32.dd72dd"\r
+        "fdbb486.bd6db38",\r
+        "ecce0ba1.70791",\r
+        "5cdec210.c3723c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d93f9a59.274b5",\r
+    "id": "7d8426b0.28b2e8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4721,\r
-    "y": 4577,\r
-    "z": "f8944603.71553",\r
+    "x": 4713.566665649414,\r
+    "y": 4588,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "a4406b4c.17bbc",\r
-        "18ca4a3.634f536",\r
-        "b4f57662.21d798",\r
-        "540d81b.ac8608"\r
+        "5a0b429f.b8f42c",\r
+        "5930a956.25a2b",\r
+        "8f7ba394.827068",\r
+        "4161f07f.2b4a78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "48346123.4f10a8",\r
+    "id": "fdbb486.bd6db38",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainA-uuid",\r
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 5123.000244140625,\r
-    "y": 4842,\r
-    "z": "f8944603.71553",\r
+    "x": 5115.566909790039,\r
+    "y": 4853,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "54a11c60.7fd1ec",\r
+    "id": "1b42c685.843199",\r
     "type": "comment",\r
     "name": "populate connectivity-A variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5130.000244140625,\r
-    "y": 4796,\r
-    "z": "f8944603.71553",\r
+    "x": 5122.566909790039,\r
+    "y": 4807,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a0a762d0.469c28",\r
+    "id": "4433eaac.652284",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4920,\r
-    "y": 6575,\r
-    "z": "f8944603.71553",\r
+    "x": 4912.566665649414,\r
+    "y": 6586,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5e210590.033b4c",\r
+    "id": "ecce0ba1.70791",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5241.000244140625,\r
-    "y": 4884,\r
-    "z": "f8944603.71553",\r
+    "x": 5233.566909790039,\r
+    "y": 4895,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "259aff1b.d97a1",\r
+    "id": "31466e0d.9a3dba",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5116,\r
-    "y": 5142,\r
-    "z": "f8944603.71553",\r
+    "x": 5108.566665649414,\r
+    "y": 5153,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "80314ddc.393748",\r
+    "id": "c7cb9f6d.ac734",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3461,\r
-    "y": 4475,\r
-    "z": "f8944603.71553",\r
+    "x": 3453.566665649414,\r
+    "y": 4486,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d1326c21.abc33",\r
+    "id": "9ba8b5cc.a415f",\r
     "type": "save",\r
     "name": "update ROOT UNI in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3983,\r
-    "y": 4576,\r
-    "z": "f8944603.71553",\r
+    "x": 3975.566665649414,\r
+    "y": 4587,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "434bd8c2.bae4f8",\r
+    "id": "595e7f4b.3b8bd8",\r
     "type": "save",\r
     "name": "get root uni from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3440,\r
-    "y": 4519,\r
-    "z": "f8944603.71553",\r
+    "x": 3432.566665649414,\r
+    "y": 4530,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7ea7dff4.93abc",\r
-        "616c8d40.285e14",\r
-        "ffe0a536.7eaff8"\r
+        "2a6568f7.a02838",\r
+        "9843c265.208d4",\r
+        "db80e493.f550d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "616c8d40.285e14",\r
+    "id": "9843c265.208d4",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3628.490966796875,\r
-    "y": 4487.57421875,\r
-    "z": "f8944603.71553",\r
+    "x": 3621.057632446289,\r
+    "y": 4498.57421875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "739b53.f4a4fcac"\r
+        "d1fd8036.140ed8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ffe0a536.7eaff8",\r
+    "id": "db80e493.f550d",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3617,\r
-    "y": 4527,\r
-    "z": "f8944603.71553",\r
+    "x": 3609.566665649414,\r
+    "y": 4538,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "68d1064e.ebb3b8"\r
+        "b0bc7666.9d27d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "739b53.f4a4fcac",\r
+    "id": "d1fd8036.140ed8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3788.0625,\r
-    "y": 4485.85986328125,\r
-    "z": "f8944603.71553",\r
+    "x": 3780.629165649414,\r
+    "y": 4496.85986328125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "68d1064e.ebb3b8",\r
+    "id": "b0bc7666.9d27d8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3778,\r
-    "y": 4528,\r
-    "z": "f8944603.71553",\r
+    "x": 3770.566665649414,\r
+    "y": 4539,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "aedbd8f5.94f11",\r
+    "id": "aa03472e.31d4e8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3780,\r
-    "y": 4572,\r
-    "z": "f8944603.71553",\r
+    "x": 3772.566665649414,\r
+    "y": 4583,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "530f885c.d5a28",\r
-        "d1326c21.abc33"\r
+        "4ba9a34f.8b45e4",\r
+        "9ba8b5cc.a415f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7ea7dff4.93abc",\r
+    "id": "2a6568f7.a02838",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3622,\r
-    "y": 4564,\r
-    "z": "f8944603.71553",\r
+    "x": 3614.566665649414,\r
+    "y": 4575,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "aedbd8f5.94f11"\r
+        "aa03472e.31d4e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "530f885c.d5a28",\r
+    "id": "4ba9a34f.8b45e4",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 3941,\r
-    "y": 4504,\r
-    "z": "f8944603.71553",\r
+    "x": 3933.566665649414,\r
+    "y": 4515,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cd1fc06c.124968",\r
+    "id": "8bf8bc6f.53ce6",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3806,\r
-    "y": 4843,\r
-    "z": "f8944603.71553",\r
+    "x": 3798.566665649414,\r
+    "y": 4854,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ac8fc812.ca8b88",\r
+    "id": "d58a2a07.e32878",\r
     "type": "comment",\r
     "name": "Temporary skipping this check - to support multiple instances in one slice",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5920.88330078125,\r
-    "y": 6592.88330078125,\r
-    "z": "f8944603.71553",\r
+    "x": 5913.449966430664,\r
+    "y": 6603.88330078125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "140ccb32.dd72dd",\r
+    "id": "5cdec210.c3723c",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5120.667236328125,\r
-    "y": 4980.08349609375,\r
-    "z": "f8944603.71553",\r
+    "x": 5113.233901977539,\r
+    "y": 4991.08349609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "60fccea7.c83a28",\r
+    "id": "7d691c73.0a445c",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5122.884033203125,\r
-    "y": 4939.88330078125,\r
-    "z": "f8944603.71553",\r
+    "x": 5115.450698852539,\r
+    "y": 4950.88330078125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b61f1c95.4694d",\r
+    "id": "19c788e0.a62557",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4996.6669921875,\r
-    "y": 5230.08349609375,\r
-    "z": "f8944603.71553",\r
+    "x": 4989.233657836914,\r
+    "y": 5241.08349609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "82a40a13.767da8",\r
+    "id": "b53673c2.40ae68",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4998.8837890625,\r
-    "y": 5189.88330078125,\r
-    "z": "f8944603.71553",\r
+    "x": 4991.450454711914,\r
+    "y": 5200.88330078125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "91bd4596.74f628",\r
+    "id": "cb99e55a.09312",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5086.466796875,\r
-    "y": 5592.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 5079.033462524414,\r
+    "y": 5603.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f50c2a2e.93dfe8",\r
+    "id": "b6bbe449.e349b8",\r
     "type": "switchNode",\r
     "name": "switch found-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4913.466796875,\r
-    "y": 5649.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 4906.033462524414,\r
+    "y": 5660.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8646fa93.554c38",\r
-        "a6ded94a.e3e54"\r
+        "9f020db8.9d3b98",\r
+        "42fb1006.cd98b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8646fa93.554c38",\r
+    "id": "9f020db8.9d3b98",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5124.466796875,\r
-    "y": 5649.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 5117.033462524414,\r
+    "y": 5660.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "258b63bd.85fb7c"\r
+        "406d3b53.ee3654"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a6ded94a.e3e54",\r
+    "id": "42fb1006.cd98b",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5120.466796875,\r
-    "y": 5697.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 5113.033462524414,\r
+    "y": 5708.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d925f9fa.8153b8"\r
+        "fa70895e.520cf8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "258b63bd.85fb7c",\r
+    "id": "406d3b53.ee3654",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5280.466796875,\r
-    "y": 5645.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 5273.033462524414,\r
+    "y": 5656.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8d6cf51e.6059f8",\r
-        "44488697.cdb02",\r
-        "c9ce352b.46ce88"\r
+        "8249d2ac.0a73f8",\r
+        "2838a041.93c678",\r
+        "45d14641.c6458"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d925f9fa.8153b8",\r
+    "id": "fa70895e.520cf8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
     "comments": "",\r
-    "x": 5268.466796875,\r
-    "y": 5692.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 5261.033462524414,\r
+    "y": 5703.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "df7464c9.77f0d",\r
+    "id": "f332f23.f01a81",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5590.3505859375,\r
-    "y": 5746.39990234375,\r
-    "z": "f8944603.71553",\r
+    "x": 5582.917251586914,\r
+    "y": 5757.39990234375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c9ce352b.46ce88",\r
+    "id": "45d14641.c6458",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5594.1337890625,\r
-    "y": 5784.60009765625,\r
-    "z": "f8944603.71553",\r
+    "x": 5586.700454711914,\r
+    "y": 5795.60009765625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "44488697.cdb02",\r
+    "id": "2838a041.93c678",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5700.466796875,\r
-    "y": 5697.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 5693.033462524414,\r
+    "y": 5708.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8d6cf51e.6059f8",\r
+    "id": "8249d2ac.0a73f8",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 5584.466796875,\r
-    "y": 5645.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 5577.033462524414,\r
+    "y": 5656.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7e224339.ebcda4",\r
+    "id": "3aa78165.d5c51e",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4975.466796875,\r
-    "y": 5550.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 4968.033462524414,\r
+    "y": 5561.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "60c16c76.a98d34",\r
+    "id": "5e482e7e.e4be78",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4687.7998046875,\r
-    "y": 5725.5166015625,\r
-    "z": "f8944603.71553",\r
+    "x": 4680.366470336914,\r
+    "y": 5736.5166015625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "91bd4596.74f628",\r
-        "f50c2a2e.93dfe8",\r
-        "b08c7802.5d204",\r
-        "7492e58a.da53dc"\r
+        "cb99e55a.09312",\r
+        "b6bbe449.e349b8",\r
+        "5021b590.5d75e4",\r
+        "316a2790.87ce5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8396080f.a7f6c8",\r
+    "id": "b03c5831.d4c5f",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4987.8330078125,\r
-    "y": 6086.2001953125,\r
-    "z": "f8944603.71553",\r
+    "x": 4980.399673461914,\r
+    "y": 6097.2001953125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e07ba4bc.bfaae8",\r
+    "id": "b60a5a20.1568d",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5794.116668701172,\r
-    "y": 6923.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 5786.683334350586,\r
+    "y": 6934.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "55635f65.d76ee8",\r
+    "id": "fe65cd53.d11278",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5413.116668701172,\r
-    "y": 6926.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 5405.683334350586,\r
+    "y": 6937.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e07ba4bc.bfaae8",\r
-        "d0282e45.27576",\r
-        "be279863.754a6"\r
+        "b60a5a20.1568d",\r
+        "364f2ed4.be66d2",\r
+        "3daa885e.628288"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d0282e45.27576",\r
+    "id": "364f2ed4.be66d2",\r
     "type": "switchNode",\r
     "name": "switch $foundVpnName",\r
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5639.116668701172,\r
-    "y": 6978.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 5631.683334350586,\r
+    "y": 6989.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "adb0d898.09cba8"\r
+        "1f12c870.4650c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "adb0d898.09cba8",\r
+    "id": "1f12c870.4650c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5818.116668701172,\r
-    "y": 6977.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 5810.683334350586,\r
+    "y": 6988.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "494eed0f.99eb84"\r
+        "8c69c55b.110248"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be279863.754a6",\r
+    "id": "3daa885e.628288",\r
     "type": "set",\r
     "name": "set vpnNameToSearch",\r
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
     "comments": "",\r
-    "x": 5640.116668701172,\r
-    "y": 6871.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 5632.683334350586,\r
+    "y": 6882.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3cd9264c.3cdbea",\r
+    "id": "651f3c1e.ddf684",\r
     "type": "notify",\r
     "name": "notify",\r
     "xml": "<notify plugin='' resource='' action='' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2634.116668701172,\r
-    "y": 920.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 2626.683334350586,\r
+    "y": 931.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d4db1de6.243c9",\r
+    "id": "f71bee39.3d2f68",\r
     "type": "set",\r
     "name": "set network-route-three",\r
     "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3312.116668701172,\r
-    "y": 696.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 3304.683334350586,\r
+    "y": 707.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b2eea3d4.d83b2",\r
+    "id": "1f090c0d.f20bac",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3528.116668701172,\r
-    "y": 1024.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 3520.683334350586,\r
+    "y": 1035.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c92a9c74.6d8cb",\r
+    "id": "4c96009f.d63af8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3523.625732421875,\r
-    "y": 1066.542724609375,\r
-    "z": "f8944603.71553",\r
+    "x": 3516.192398071289,\r
+    "y": 1077.542724609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "be6d3c2.c1bdfc",\r
+    "id": "30702b44.ca2744",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3527.625701904297,\r
-    "y": 1114.5426940917969,\r
-    "z": "f8944603.71553",\r
+    "x": 3520.192367553711,\r
+    "y": 1125.5426940917969,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "82044de7.824378"\r
+        "f0fe90c1.1ee158"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "82044de7.824378",\r
+    "id": "f0fe90c1.1ee158",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3685.116668701172,\r
-    "y": 1114.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 3677.683334350586,\r
+    "y": 1125.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9732d3c5.76e0c8"\r
+        "24f554c8.25b494"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9732d3c5.76e0c8",\r
+    "id": "24f554c8.25b494",\r
     "type": "switchNode",\r
     "name": "switch nr type",\r
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3855.11669921875,\r
-    "y": 1117.1168212890625,\r
-    "z": "f8944603.71553",\r
+    "x": 3847.683364868164,\r
+    "y": 1128.1168212890625,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7d1d73b.5c3fc8c",\r
-        "8cd6f95a.d7c4d",\r
-        "68098f91.a64618"\r
+        "92b753af.8b83b",\r
+        "e0d04b94.0a949",\r
+        "3f783acd.f1212e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7d1d73b.5c3fc8c",\r
+    "id": "92b753af.8b83b",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4029.116668701172,\r
-    "y": 1055.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4021.683334350586,\r
+    "y": 1066.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "a9479bec.894888"\r
+        "34be9217.24bb7e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8cd6f95a.d7c4d",\r
+    "id": "e0d04b94.0a949",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4031.116668701172,\r
-    "y": 1109.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4023.683334350586,\r
+    "y": 1120.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d844935e.741748"\r
+        "1a5ec0d1.1d1527"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a9479bec.894888",\r
+    "id": "34be9217.24bb7e",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4157.116668701172,\r
-    "y": 1055.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4149.683334350586,\r
+    "y": 1066.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7a232bae.539a2c",\r
-        "19f7263a.0f2e72"\r
+        "c2e9a46e.2fa128",\r
+        "d3171aa3.cb0078"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d844935e.741748",\r
+    "id": "1a5ec0d1.1d1527",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4160.116668701172,\r
-    "y": 1108.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4152.683334350586,\r
+    "y": 1119.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e31191f4.c7e44",\r
-        "c783c2e3.52d62"\r
+        "1fb8ea51.9b1c8e",\r
+        "b9df456c.24fc38"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "19f7263a.0f2e72",\r
+    "id": "d3171aa3.cb0078",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4318.116668701172,\r
-    "y": 1079.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4310.683334350586,\r
+    "y": 1090.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e31191f4.c7e44",\r
+    "id": "1fb8ea51.9b1c8e",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4335.116668701172,\r
-    "y": 1121.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4327.683334350586,\r
+    "y": 1132.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c783c2e3.52d62",\r
+    "id": "b9df456c.24fc38",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4320.116668701172,\r
-    "y": 1159.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4312.683334350586,\r
+    "y": 1170.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7a232bae.539a2c",\r
+    "id": "c2e9a46e.2fa128",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4332.116668701172,\r
-    "y": 1039.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4324.683334350586,\r
+    "y": 1050.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5dbb2ad5.55ee04",\r
+    "id": "dc69c361.915968",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4497.116668701172,\r
-    "y": 1055.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4489.683334350586,\r
+    "y": 1066.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4c9f1a43.e137e4",\r
+    "id": "6cb3b80a.d81b1",\r
     "type": "save",\r
     "name": "get network-route-three from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3288.116668701172,\r
-    "y": 1041.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 3280.683334350586,\r
+    "y": 1052.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b2eea3d4.d83b2",\r
-        "c92a9c74.6d8cb",\r
-        "be6d3c2.c1bdfc"\r
+        "1f090c0d.f20bac",\r
+        "4c96009f.d63af8",\r
+        "30702b44.ca2744"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "68098f91.a64618",\r
+    "id": "3f783acd.f1212e",\r
     "type": "outcome",\r
     "name": "SECONDARY-ROOT",\r
     "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3974.116668701172,\r
-    "y": 1173.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 3966.683334350586,\r
+    "y": 1184.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "3baeb12d.78947e"\r
+        "ce69203c.a7c0d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3baeb12d.78947e",\r
+    "id": "ce69203c.a7c0d",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4148.116668701172,\r
-    "y": 1168.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4140.683334350586,\r
+    "y": 1179.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f32a06d7.18ee6",\r
-        "9c8c5f6f.4f4828"\r
+        "77a19b24.92e3d4",\r
+        "6c3b4ea8.3b622"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9c8c5f6f.4f4828",\r
+    "id": "6c3b4ea8.3b622",\r
     "type": "set",\r
     "name": "set network-route-C",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4318.116668701172,\r
-    "y": 1241.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4310.683334350586,\r
+    "y": 1252.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f32a06d7.18ee6",\r
+    "id": "77a19b24.92e3d4",\r
     "type": "set",\r
     "name": "set network-route-SECONDARY-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4372.116668701172,\r
-    "y": 1201.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4364.683334350586,\r
+    "y": 1212.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "89b3411b.fe2cb",\r
+    "id": "a7c6adcc.5c3908",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4486.116668701172,\r
-    "y": 1226.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4478.683334350586,\r
+    "y": 1237.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fe4b773c.0eae98",\r
+    "id": "cb966d3f.bcf358",\r
     "type": "outcome",\r
     "name": "SECONDARY-ROOT",\r
     "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4045.116668701172,\r
-    "y": 929.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4037.683334350586,\r
+    "y": 940.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "a6d4107d.6655f"\r
+        "359af935.19ef46"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e8ae3a08.56b988",\r
+    "id": "ca572ac1.2b94f8",\r
     "type": "set",\r
     "name": "set network-route-C",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4389.116668701172,\r
-    "y": 997.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4381.683334350586,\r
+    "y": 1008.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8ecb2104.b1fc58",\r
+    "id": "60fff9bd.2ccfe",\r
     "type": "set",\r
     "name": "set network-route-SECONDARY-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4443.116668701172,\r
-    "y": 957.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4435.683334350586,\r
+    "y": 968.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a817660e.e9d2",\r
+    "id": "74e2fab5.3910b4",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4587.116668701172,\r
-    "y": 986.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4579.683334350586,\r
+    "y": 997.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a6d4107d.6655f",\r
+    "id": "359af935.19ef46",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4219.116668701172,\r
-    "y": 924.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4211.683334350586,\r
+    "y": 935.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8ecb2104.b1fc58",\r
-        "e8ae3a08.56b988"\r
+        "60fff9bd.2ccfe",\r
+        "ca572ac1.2b94f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "83ce05e.7f315f8",\r
+    "id": "dd62b4eb.26fb1",\r
     "type": "outcome",\r
     "name": "SECONDARY-ROOT",\r
     "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4105.116668701172,\r
-    "y": 667.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4097.683334350586,\r
+    "y": 678.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d03cb873.c57328"\r
+        "eaab099.c2c5e78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2049e56d.3172ca",\r
+    "id": "44f31aac.78bf4c",\r
     "type": "set",\r
     "name": "set network-route-C",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4449.116668701172,\r
-    "y": 735.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4441.683334350586,\r
+    "y": 746.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6995e48e.171b9c",\r
+    "id": "e00b5614.1b212",\r
     "type": "set",\r
     "name": "set network-route-SECONDARY-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4503.116668701172,\r
-    "y": 695.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4495.683334350586,\r
+    "y": 706.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "80fe4b30.9273d",\r
+    "id": "fb8145.224d2eb8",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4617.116668701172,\r
-    "y": 720.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4609.683334350586,\r
+    "y": 731.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d03cb873.c57328",\r
+    "id": "eaab099.c2c5e78",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4279.116668701172,\r
-    "y": 662.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 4271.683334350586,\r
+    "y": 673.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "6995e48e.171b9c",\r
-        "2049e56d.3172ca"\r
+        "e00b5614.1b212",\r
+        "44f31aac.78bf4c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d8eb368d.7e35e8",\r
+    "id": "47b6d6c0.771098",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3686.116668701172,\r
-    "y": 2544.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3678.683334350586,\r
+    "y": 2555.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9d31c4f.62b63b8",\r
-        "42d540.6e2552c"\r
+        "d5c762a3.e1b22",\r
+        "cd80f814.c17fb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4acebe87.51a2e",\r
+    "id": "6a53c92c.c39ad8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3513.450164794922,\r
-    "y": 2545.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3506.016830444336,\r
+    "y": 2556.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d8eb368d.7e35e8"\r
+        "47b6d6c0.771098"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "faf79ca9.39c718",\r
+    "id": "15ee64d.915489b",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3522.941131591797,\r
-    "y": 2587.690704345703,\r
-    "z": "f8944603.71553",\r
+    "x": 3515.507797241211,\r
+    "y": 2598.690704345703,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "760b8826.a76aa",\r
+    "id": "ffc72b13.54b308",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3511.450164794922,\r
-    "y": 2634.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3504.016830444336,\r
+    "y": 2645.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9d31c4f.62b63b8",\r
+    "id": "d5c762a3.e1b22",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3972.450164794922,\r
-    "y": 2548.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 3965.016830444336,\r
+    "y": 2559.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "beea1414.622ca8",\r
-        "e0900c85.f5153"\r
+        "39f97b3f.483dec",\r
+        "a10b377c.8904d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e0900c85.f5153",\r
+    "id": "a10b377c.8904d8",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4195.450164794922,\r
-    "y": 2503.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4188.016830444336,\r
+    "y": 2514.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b1fce547.cdefa8"\r
+        "1c79745.54c4b0c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "beea1414.622ca8",\r
+    "id": "39f97b3f.483dec",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4197.450164794922,\r
-    "y": 2567.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4190.016830444336,\r
+    "y": 2578.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "1f2077c9.d2f12"\r
+        "5e26eb53.994624"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1931dff5.72d728",\r
+    "id": "59ced5c4.1cbb54",\r
     "type": "save",\r
     "name": "get p-interface-dst from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3285.450164794922,\r
-    "y": 2580.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3278.016830444336,\r
+    "y": 2591.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "4acebe87.51a2e",\r
-        "faf79ca9.39c718",\r
-        "760b8826.a76aa"\r
+        "6a53c92c.c39ad8",\r
+        "15ee64d.915489b",\r
+        "ffc72b13.54b308"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "20a2805c.f7ce68",\r
+    "id": "bf53a639.73b6d8",\r
     "type": "comment",\r
     "name": "Question?",\r
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
     "comments": "",\r
-    "x": 3246.450164794922,\r
-    "y": 2524.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3239.016830444336,\r
+    "y": 2535.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f953800.9cf34",\r
+    "id": "7411f30.15b1c8c",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3305.450164794922,\r
-    "y": 2320.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3298.016830444336,\r
+    "y": 2331.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "1523d633.28a802",\r
-        "23587c7d.fbba4c"\r
+        "dd801267.ae8a78",\r
+        "2c468159.26cb9e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "23587c7d.fbba4c",\r
+    "id": "2c468159.26cb9e",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3528.450164794922,\r
-    "y": 2306.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3521.016830444336,\r
+    "y": 2317.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "c7b4b7e7.8e8b78"\r
+        "1f5c2f54.7e50d9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1523d633.28a802",\r
+    "id": "dd801267.ae8a78",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3530.450164794922,\r
-    "y": 2339.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3523.016830444336,\r
+    "y": 2350.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c7b4b7e7.8e8b78",\r
+    "id": "1f5c2f54.7e50d9",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3676.450164794922,\r
-    "y": 2299.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3669.016830444336,\r
+    "y": 2310.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cb965cfe.67a2f",\r
-        "1a7add8d.af97ca"\r
+        "33d7ee91.be9492",\r
+        "2cd16653.cccd12"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cb965cfe.67a2f",\r
+    "id": "33d7ee91.be9492",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",\r
     "comments": "",\r
-    "x": 3870.450164794922,\r
-    "y": 2302.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 3863.016830444336,\r
+    "y": 2313.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "42d540.6e2552c",\r
+    "id": "cd80f814.c17fb8",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3923.4501342773438,\r
-    "y": 2671.1166381835938,\r
-    "z": "f8944603.71553",\r
+    "x": 3916.016799926758,\r
+    "y": 2682.1166381835938,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b84e7511.3844a8"\r
+        "f197c90a.b0bfd8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b84e7511.3844a8",\r
+    "id": "f197c90a.b0bfd8",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4129.450134277344,\r
-    "y": 2671.1166381835938,\r
-    "z": "f8944603.71553",\r
+    "x": 4122.016799926758,\r
+    "y": 2682.1166381835938,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ac19c527.29aaf8"\r
+        "ee87c14f.7e00c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1a7add8d.af97ca",\r
+    "id": "2cd16653.cccd12",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3892.450164794922,\r
-    "y": 2370.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 3885.016830444336,\r
+    "y": 2381.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "c6c93f82.1aa228",\r
-        "f4da497f.0275c8",\r
-        "6e9758a5.eabec"\r
+        "b86ed6f1.7f482",\r
+        "f1a441ce.e5665",\r
+        "de4f03bc.b1dad"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c6c93f82.1aa228",\r
+    "id": "b86ed6f1.7f482",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4087.9502868652344,\r
-    "y": 2322.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4080.5169525146484,\r
+    "y": 2333.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "a1f1dc1c.4be4e8"\r
+        "4728dd3.dc78424"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f4da497f.0275c8",\r
+    "id": "f1a441ce.e5665",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4079.9502868652344,\r
-    "y": 2377.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4072.5169525146484,\r
+    "y": 2388.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "dd2530b3.0ce388"\r
+        "250a014d.a07c5e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6e9758a5.eabec",\r
+    "id": "de4f03bc.b1dad",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4084.9502868652344,\r
-    "y": 2434.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4077.5169525146484,\r
+    "y": 2445.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "35cb1b46.9ab3ac"\r
+        "c4850afb.039ba"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "35cb1b46.9ab3ac",\r
+    "id": "c4850afb.039ba",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4236.950286865234,\r
-    "y": 2435.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4229.516952514648,\r
+    "y": 2446.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a1f1dc1c.4be4e8",\r
+    "id": "4728dd3.dc78424",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4232.332611083984,\r
-    "y": 2319.7724609375,\r
-    "z": "f8944603.71553",\r
+    "x": 4224.899276733398,\r
+    "y": 2330.7724609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "807e8aa5.b5f288"\r
+        "f5f74636.92701"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be1fed24.75522",\r
+    "id": "b2338e3d.f752e8",\r
     "type": "set",\r
     "name": "set SECONDARY-ROOT stuff",\r
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3308.116668701172,\r
-    "y": 2659.116668701172,\r
-    "z": "f8944603.71553",\r
+    "x": 3300.683334350586,\r
+    "y": 2670.116668701172,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "89002347.f12fb8",\r
+    "id": "b3bc28cb.23625",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3983.1166381835938,\r
-    "y": 2623.1166381835938,\r
-    "z": "f8944603.71553",\r
+    "x": 3975.683303833008,\r
+    "y": 2634.1166381835938,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1f2077c9.d2f12",\r
+    "id": "5e26eb53.994624",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 4356.450164794922,\r
-    "y": 2586.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4349.016830444336,\r
+    "y": 2597.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b1fce547.cdefa8",\r
+    "id": "1c79745.54c4b0c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4360.450164794922,\r
-    "y": 2500.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4353.016830444336,\r
+    "y": 2511.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9ddcbad2.3cd968",\r
-        "a4909c74.16b3c"\r
+        "fe7cdeb0.daac9",\r
+        "34c0d4b1.5c7dfc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ac19c527.29aaf8",\r
+    "id": "ee87c14f.7e00c8",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4346.735778808594,\r
-    "y": 2669.9384155273438,\r
-    "z": "f8944603.71553",\r
+    "x": 4339.302444458008,\r
+    "y": 2680.9384155273438,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "aecc45b1.07799"\r
+        "fc8a72d4.98e42"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dd2530b3.0ce388",\r
+    "id": "250a014d.a07c5e",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4247.950286865234,\r
-    "y": 2380.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4240.516952514648,\r
+    "y": 2391.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9ddcbad2.3cd968",\r
+    "id": "fe7cdeb0.daac9",\r
     "type": "set",\r
     "name": "set ltpId",\r
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",\r
     "comments": "",\r
-    "x": 4530.450164794922,\r
-    "y": 2461.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4523.016830444336,\r
+    "y": 2472.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a4909c74.16b3c",\r
+    "id": "34c0d4b1.5c7dfc",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",\r
     "comments": "",\r
-    "x": 4531.450164794922,\r
-    "y": 2566.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4524.016830444336,\r
+    "y": 2577.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "90f369e0.1f5ea",\r
+    "id": "6a8cd207.c1e8c4",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
     "comments": "",\r
-    "x": 4526.450164794922,\r
-    "y": 2515.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4519.016830444336,\r
+    "y": 2526.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "aecc45b1.07799",\r
+    "id": "fc8a72d4.98e42",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4553.567321777344,\r
-    "y": 2659.4570922851562,\r
-    "z": "f8944603.71553",\r
+    "x": 4546.133987426758,\r
+    "y": 2670.4570922851562,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d7d46b6.f157298",\r
-        "a76ccf28.3b019",\r
-        "6d38c2ba.e73f94"\r
+        "8f4cacd5.ce6228",\r
+        "4e56644.a64779c",\r
+        "68f649.e92691b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d7d46b6.f157298",\r
+    "id": "8f4cacd5.ce6228",\r
     "type": "set",\r
     "name": "set destination ttp-id",\r
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 4768.567321777344,\r
-    "y": 2621.4570922851562,\r
-    "z": "f8944603.71553",\r
+    "x": 4761.133987426758,\r
+    "y": 2632.4570922851562,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a76ccf28.3b019",\r
+    "id": "4e56644.a64779c",\r
     "type": "get-resource",\r
     "name": "get-resource src TTP",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4765.567321777344,\r
-    "y": 2660.4570922851562,\r
-    "z": "f8944603.71553",\r
+    "x": 4758.133987426758,\r
+    "y": 2671.4570922851562,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "af66a72d.a68048"\r
+        "9a6ae8ae.1adf3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6d38c2ba.e73f94",\r
+    "id": "68f649.e92691b8",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4721.067321777344,\r
-    "y": 2702.4570922851562,\r
-    "z": "f8944603.71553",\r
+    "x": 4713.633987426758,\r
+    "y": 2713.4570922851562,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "56aae750.4bf18",\r
+    "id": "d8d22b92.e3f9c8",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4814.450164794922,\r
-    "y": 2338.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4807.016830444336,\r
+    "y": 2349.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "df2c6ab5.f8c7a"\r
+        "8d5de697.738fb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "807e8aa5.b5f288",\r
+    "id": "f5f74636.92701",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4416.450164794922,\r
-    "y": 2334.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4409.016830444336,\r
+    "y": 2345.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "83815f42.db62e8"\r
+        "458de584.eb17d4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "83815f42.db62e8",\r
+    "id": "458de584.eb17d4",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4611.450164794922,\r
-    "y": 2334.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4604.016830444336,\r
+    "y": 2345.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "56aae750.4bf18",\r
-        "ace3955f.b78118"\r
+        "d8d22b92.e3f9c8",\r
+        "aa17b1cc.ebb808"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ace3955f.b78118",\r
+    "id": "aa17b1cc.ebb808",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4816.450164794922,\r
-    "y": 2411.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4809.016830444336,\r
+    "y": 2422.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "86fe5017.1c8158"\r
+        "74ed71f8.f337d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af66a72d.a68048",\r
+    "id": "9a6ae8ae.1adf3",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4946.067321777344,\r
-    "y": 2659.4570922851562,\r
-    "z": "f8944603.71553",\r
+    "x": 4938.633987426758,\r
+    "y": 2670.4570922851562,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "73b98dcb.d53e2c"\r
+        "48cbb65c.c75f18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "73b98dcb.d53e2c",\r
+    "id": "48cbb65c.c75f18",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5104.067321777344,\r
-    "y": 2659.4570922851562,\r
-    "z": "f8944603.71553",\r
+    "x": 5096.633987426758,\r
+    "y": 2670.4570922851562,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "35f64a50.ea71a6"\r
+        "5d1f9a1.a44f9e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "35f64a50.ea71a6",\r
+    "id": "5d1f9a1.a44f9e4",\r
     "type": "set",\r
     "name": "set destination tunnel tp ip",\r
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",\r
     "comments": "",\r
-    "x": 5311.067321777344,\r
-    "y": 2659.4570922851562,\r
-    "z": "f8944603.71553",\r
+    "x": 5303.633987426758,\r
+    "y": 2670.4570922851562,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "df2c6ab5.f8c7a",\r
+    "id": "8d5de697.738fb",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4991.450164794922,\r
-    "y": 2330.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4984.016830444336,\r
+    "y": 2341.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "b41095a1.9dd71",\r
-        "c294b821.4082d"\r
+        "557f2b2a.e4488c",\r
+        "b7eb9cb4.7bd228"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c294b821.4082d",\r
+    "id": "b7eb9cb4.7bd228",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5199.450164794922,\r
-    "y": 2337.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 5192.016830444336,\r
+    "y": 2348.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cbd53666.7a192",\r
-        "70f8105c.8c53c8",\r
-        "d07f4c5c.e57d28"\r
+        "2cc0f80f.8e664",\r
+        "e33c4c36.9c6408",\r
+        "decf6255.02de4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "86fe5017.1c8158",\r
+    "id": "74ed71f8.f337d8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4993.450164794922,\r
-    "y": 2403.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 4986.016830444336,\r
+    "y": 2414.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "29792fa0.312a5"\r
+        "ddc00f08.8fee3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b41095a1.9dd71",\r
+    "id": "557f2b2a.e4488c",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainC id",\r
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5229.450164794922,\r
-    "y": 2285.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 5222.016830444336,\r
+    "y": 2296.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "29792fa0.312a5",\r
+    "id": "ddc00f08.8fee3",\r
     "type": "set",\r
     "name": "set domainC ethernet layer network-id",\r
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5228.450164794922,\r
-    "y": 2527.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 5221.016830444336,\r
+    "y": 2538.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cbd53666.7a192",\r
+    "id": "2cc0f80f.8e664",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5409.450164794922,\r
-    "y": 2328.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 5402.016830444336,\r
+    "y": 2339.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "12fe1a85.5f5265"\r
+        "aada8b04.37bbe"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "70f8105c.8c53c8",\r
+    "id": "e33c4c36.9c6408",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5401.450164794922,\r
-    "y": 2383.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 5394.016830444336,\r
+    "y": 2394.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "720591da.7ff908"\r
+        "52b0fc34.6385e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d07f4c5c.e57d28",\r
+    "id": "decf6255.02de4",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5406.450164794922,\r
-    "y": 2440.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 5399.016830444336,\r
+    "y": 2451.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "50fd00db.804e78"\r
+        "1d0f9aee.0f2085"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "50fd00db.804e78",\r
+    "id": "1d0f9aee.0f2085",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5558.450164794922,\r
-    "y": 2441.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 5551.016830444336,\r
+    "y": 2452.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "720591da.7ff908",\r
+    "id": "52b0fc34.6385e4",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5569.450164794922,\r
-    "y": 2386.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 5562.016830444336,\r
+    "y": 2397.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "12fe1a85.5f5265",\r
+    "id": "aada8b04.37bbe",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5553.832489013672,\r
-    "y": 2325.7724609375,\r
-    "z": "f8944603.71553",\r
+    "x": 5546.399154663086,\r
+    "y": 2336.7724609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d4fbd78f.a8b058"\r
+        "b0a8403b.df77f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d4fbd78f.a8b058",\r
+    "id": "b0a8403b.df77f8",\r
     "type": "set",\r
     "name": "set controller domainC data",\r
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
     "comments": "",\r
-    "x": 5768.450164794922,\r
-    "y": 2322.1167907714844,\r
-    "z": "f8944603.71553",\r
+    "x": 5761.016830444336,\r
+    "y": 2333.1167907714844,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3ab03c8.bdf8544",\r
+    "id": "8b07e19d.5f94",\r
     "type": "switchNode",\r
     "name": "switch secondary empty?",\r
     "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3282.116668701172,\r
-    "y": 795.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 3274.683334350586,\r
+    "y": 806.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7806cbe6.64ea14",\r
-        "91bd4861.b38048"\r
+        "ba76d6d3.05fe9",\r
+        "fe627d30.e07a9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7806cbe6.64ea14",\r
+    "id": "ba76d6d3.05fe9",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3404.11669921875,\r
-    "y": 740.11669921875,\r
-    "z": "f8944603.71553",\r
+    "x": 3396.683364868164,\r
+    "y": 751.11669921875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "4d1b7d4.397bf04"\r
+        "aae22e84.83191"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "91bd4861.b38048",\r
+    "id": "fe627d30.e07a9",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3391.11669921875,\r
-    "y": 849.11669921875,\r
-    "z": "f8944603.71553",\r
+    "x": 3383.683364868164,\r
+    "y": 860.11669921875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "a8d8fc87.45b9a"\r
+        "652bcf4e.b1513"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4d1b7d4.397bf04",\r
+    "id": "aae22e84.83191",\r
     "type": "set",\r
     "name": "set hasSecondary false",\r
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3619.116668701172,\r
-    "y": 577.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 3611.683334350586,\r
+    "y": 588.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a8d8fc87.45b9a",\r
+    "id": "652bcf4e.b1513",\r
     "type": "set",\r
     "name": "set hasSecondary true",\r
     "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3615.116668701172,\r
-    "y": 621.1166687011719,\r
-    "z": "f8944603.71553",\r
+    "x": 3607.683334350586,\r
+    "y": 632.1166687011719,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "87dcb71b.a618f",\r
+    "id": "8877dbf4.9fef7",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3812.11669921875,\r
-    "y": 3521.11669921875,\r
-    "z": "f8944603.71553",\r
+    "x": 3804.683364868164,\r
+    "y": 3532.11669921875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9a1c6f33.80c0c"\r
+        "8a807ecd.e2d688"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9a1c6f33.80c0c",\r
+    "id": "8a807ecd.e2d688",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4003.11669921875,\r
-    "y": 3525.11669921875,\r
-    "z": "f8944603.71553",\r
+    "x": 3995.683364868164,\r
+    "y": 3536.11669921875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8de09ee3.1f82b8"\r
+        "157127d1.cb4078"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8de09ee3.1f82b8",\r
+    "id": "157127d1.cb4078",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4130.11669921875,\r
-    "y": 3524.11669921875,\r
-    "z": "f8944603.71553",\r
+    "x": 4122.683364868164,\r
+    "y": 3535.11669921875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cc59ae49.952b8",\r
-        "3b72359b.f45e6a"\r
+        "75df7ed7.bf083",\r
+        "34e17ebd.74d332"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3b72359b.f45e6a",\r
+    "id": "34e17ebd.74d332",\r
     "type": "save",\r
     "name": "save SECONDARY-ROOT UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4352.11669921875,\r
-    "y": 3413.11669921875,\r
-    "z": "f8944603.71553",\r
+    "x": 4344.683364868164,\r
+    "y": 3424.11669921875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d566dc7.835f6a",\r
+    "id": "877b276.88c73d8",\r
     "type": "set",\r
     "name": "unset secondary related variables",\r
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",\r
     "comments": "",\r
-    "x": 3357,\r
-    "y": 453,\r
-    "z": "f8944603.71553",\r
+    "x": 3349.566665649414,\r
+    "y": 464,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cc59ae49.952b8",\r
+    "id": "75df7ed7.bf083",\r
     "type": "switchNode",\r
     "name": "switch 2-ROOTS in same domain?",\r
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4348,\r
-    "y": 3472,\r
-    "z": "f8944603.71553",\r
+    "x": 4340.566665649414,\r
+    "y": 3483,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e0cf290a.3bb57",\r
-        "91bee9e5.bd12c8"\r
+        "298158e5.1b02b8",\r
+        "8816a027.c5ad7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e0cf290a.3bb57",\r
+    "id": "298158e5.1b02b8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4558,\r
-    "y": 3449,\r
-    "z": "f8944603.71553",\r
+    "x": 4550.566665649414,\r
+    "y": 3460,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "2e6c4f7b.89f37"\r
+        "2754d16a.8d72ae"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2e6c4f7b.89f37",\r
+    "id": "2754d16a.8d72ae",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4684,\r
-    "y": 3449,\r
-    "z": "f8944603.71553",\r
+    "x": 4676.566665649414,\r
+    "y": 3460,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e80cf077.13626"\r
+        "1ec26074.15dbf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb956f81.674a8",\r
+    "id": "7bc2899d.3cc8d",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4689,\r
-    "y": 3498,\r
-    "z": "f8944603.71553",\r
+    "x": 4681.566665649414,\r
+    "y": 3509,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "538ba095.13ecb8",\r
-        "a894e133.03a62",\r
-        "bbac82b0.611ad8",\r
-        "5d08bff9.d57b18"\r
+        "4336d7d0.b3e05",\r
+        "60df6ba0.591fdc",\r
+        "73d9646c.b91d7c",\r
+        "81cba3c.9ee8de"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "91bee9e5.bd12c8",\r
+    "id": "8816a027.c5ad7",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4563,\r
-    "y": 3498,\r
-    "z": "f8944603.71553",\r
+    "x": 4555.566665649414,\r
+    "y": 3509,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "eb956f81.674a8"\r
+        "7bc2899d.3cc8d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e80cf077.13626",\r
+    "id": "1ec26074.15dbf",\r
     "type": "save",\r
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5012,\r
-    "y": 3446,\r
-    "z": "f8944603.71553",\r
+    "x": 5004.566665649414,\r
+    "y": 3457,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "538ba095.13ecb8",\r
+    "id": "4336d7d0.b3e05",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainC",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4965,\r
-    "y": 3537,\r
-    "z": "f8944603.71553",\r
+    "x": 4957.566665649414,\r
+    "y": 3548,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a894e133.03a62",\r
+    "id": "60df6ba0.591fdc",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4913,\r
-    "y": 3579,\r
-    "z": "f8944603.71553",\r
+    "x": 4905.566665649414,\r
+    "y": 3590,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bbac82b0.611ad8",\r
+    "id": "73d9646c.b91d7c",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5042,\r
-    "y": 3621,\r
-    "z": "f8944603.71553",\r
+    "x": 5034.566665649414,\r
+    "y": 3632,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7be6dab9.621efc",\r
+    "id": "63767aff.e83474",\r
     "type": "comment",\r
     "name": "Create SECONDARY-ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4928,\r
-    "y": 3494,\r
-    "z": "f8944603.71553",\r
+    "x": 4920.566665649414,\r
+    "y": 3505,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5d08bff9.d57b18",\r
+    "id": "81cba3c.9ee8de",\r
     "type": "save",\r
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5020,\r
-    "y": 3669,\r
-    "z": "f8944603.71553",\r
+    "x": 5012.566665649414,\r
+    "y": 3680,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "748bc1ca.c78678",\r
+    "id": "238550a0.c6cd18",\r
     "type": "comment",\r
     "name": "Create SECONDARY-ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3840,\r
-    "y": 3472,\r
-    "z": "f8944603.71553",\r
+    "x": 3832.566665649414,\r
+    "y": 3483,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "286f0ec8.852352",\r
+    "id": "374b533b.d2c934",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3815,\r
-    "y": 4143,\r
-    "z": "f8944603.71553",\r
+    "x": 3807.566665649414,\r
+    "y": 4154,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d7543b1f.0223a"\r
+        "42d7b44a.367424"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d7543b1f.0223a",\r
+    "id": "42d7b44a.367424",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4007,\r
-    "y": 4138,\r
-    "z": "f8944603.71553",\r
+    "x": 3999.566665649414,\r
+    "y": 4149,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "8aacb5a.7bd82c8"\r
+        "aa122d60.47dec8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8aacb5a.7bd82c8",\r
+    "id": "aa122d60.47dec8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4136,\r
-    "y": 4138,\r
-    "z": "f8944603.71553",\r
+    "x": 4128.566665649414,\r
+    "y": 4149,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9ecf386c.da77f"\r
+        "bc496cc4.1ac428"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9ecf386c.da77f",\r
+    "id": "bc496cc4.1ac428",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4468,\r
-    "y": 4136,\r
-    "z": "f8944603.71553",\r
+    "x": 4460.566665649414,\r
+    "y": 4147,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2bbca6cc.0ec622",\r
+    "id": "e008f489.a45f08",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3803,\r
-    "y": 4367,\r
-    "z": "f8944603.71553",\r
+    "x": 3795.566665649414,\r
+    "y": 4378,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "85f62fba.be3af8"\r
+        "7e1de7f3.95bcb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "85f62fba.be3af8",\r
+    "id": "7e1de7f3.95bcb",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3983,\r
-    "y": 4366,\r
-    "z": "f8944603.71553",\r
+    "x": 3975.566665649414,\r
+    "y": 4377,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f0b10235.e7e788"\r
+        "5cd7b855.2a4ef"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f0b10235.e7e788",\r
+    "id": "5cd7b855.2a4ef",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4112,\r
-    "y": 4366,\r
-    "z": "f8944603.71553",\r
+    "x": 4104.566665649414,\r
+    "y": 4377,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "ccf3ecf0.96a2b"\r
+        "e3d19dba.c0bd7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ccf3ecf0.96a2b",\r
+    "id": "e3d19dba.c0bd7",\r
     "type": "switchNode",\r
     "name": "switch 2-ROOTS in same domain?",\r
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4329.88330078125,\r
-    "y": 4364.88330078125,\r
-    "z": "f8944603.71553",\r
+    "x": 4322.449966430664,\r
+    "y": 4375.88330078125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "cabe89a7.9d69e"\r
+        "53c7d161.8eb9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cabe89a7.9d69e",\r
+    "id": "53c7d161.8eb9",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4544.88330078125,\r
-    "y": 4364.88330078125,\r
-    "z": "f8944603.71553",\r
+    "x": 4537.449966430664,\r
+    "y": 4375.88330078125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "760290ae.a21e"\r
+        "fbe01cc.5b1afe"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "760290ae.a21e",\r
+    "id": "fbe01cc.5b1afe",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4676.88330078125,\r
-    "y": 4364.88330078125,\r
-    "z": "f8944603.71553",\r
+    "x": 4669.449966430664,\r
+    "y": 4375.88330078125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d0b7affb.c1db2"\r
+        "2bf4a87a.e670f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d0b7affb.c1db2",\r
+    "id": "2bf4a87a.e670f8",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5041,\r
-    "y": 4364,\r
-    "z": "f8944603.71553",\r
+    "x": 5033.566665649414,\r
+    "y": 4375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c32fbe2a.4ce3f",\r
+    "id": "1e2222c.7b917dd",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3478,\r
-    "y": 4622,\r
-    "z": "f8944603.71553",\r
+    "x": 3470.566665649414,\r
+    "y": 4633,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f2b98ff2.538df8"\r
+        "99a3a0e8.0b0e08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f2b98ff2.538df8",\r
+    "id": "99a3a0e8.0b0e08",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3658,\r
-    "y": 4621,\r
-    "z": "f8944603.71553",\r
+    "x": 3650.566665649414,\r
+    "y": 4632,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "44866831.1c971"\r
+        "34a5a7ab.8782f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "44866831.1c971",\r
+    "id": "34a5a7ab.8782f",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3787,\r
-    "y": 4621,\r
-    "z": "f8944603.71553",\r
+    "x": 3779.566665649414,\r
+    "y": 4632,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "531a8e91.6c36e8"\r
+        "41dd40eb.c66e7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6aa2083f.c88dc",\r
+    "id": "1e73a5a2.1f85da",\r
     "type": "comment",\r
     "name": "Update SECONDARY-ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3523,\r
-    "y": 4680,\r
-    "z": "f8944603.71553",\r
+    "x": 3515.566665649414,\r
+    "y": 4691,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5db121cf.f62b2",\r
+    "id": "d18a7342.6feac8",\r
     "type": "save",\r
     "name": "update S-ROOT UNI in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4089,\r
-    "y": 4779,\r
-    "z": "f8944603.71553",\r
+    "x": 4081.566665649414,\r
+    "y": 4790,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "531a8e91.6c36e8",\r
+    "id": "41dd40eb.c66e7",\r
     "type": "save",\r
     "name": "get S-root uni from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3553,\r
-    "y": 4713,\r
-    "z": "f8944603.71553",\r
+    "x": 3545.566665649414,\r
+    "y": 4724,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "5ffa37b0.a29d98",\r
-        "2e65d2b6.ac2056",\r
-        "b5462b77.92e368"\r
+        "f4cc70f5.9b6bc",\r
+        "ce8af9cd.332b9",\r
+        "130dfbc3.4a6c5c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2e65d2b6.ac2056",\r
+    "id": "ce8af9cd.332b9",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3734.490966796875,\r
-    "y": 4690.57421875,\r
-    "z": "f8944603.71553",\r
+    "x": 3727.057632446289,\r
+    "y": 4701.57421875,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "5fe821cf.842878"\r
+        "3c80b807.6a4d88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b5462b77.92e368",\r
+    "id": "130dfbc3.4a6c5c",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3723,\r
-    "y": 4730,\r
-    "z": "f8944603.71553",\r
+    "x": 3715.566665649414,\r
+    "y": 4741,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "6ea658d1.17df7"\r
+        "c80f59b7.c8277"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5fe821cf.842878",\r
+    "id": "3c80b807.6a4d88",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3894.0625,\r
-    "y": 4688.85986328125,\r
-    "z": "f8944603.71553",\r
+    "x": 3886.629165649414,\r
+    "y": 4699.85986328125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6ea658d1.17df7",\r
+    "id": "c80f59b7.c8277",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3884,\r
-    "y": 4731,\r
-    "z": "f8944603.71553",\r
+    "x": 3876.566665649414,\r
+    "y": 4742,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4792a0c5.aeb76",\r
+    "id": "96ee8bec.e5c4a8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3886,\r
-    "y": 4775,\r
-    "z": "f8944603.71553",\r
+    "x": 3878.566665649414,\r
+    "y": 4786,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "78930237.780be4",\r
-        "5db121cf.f62b2"\r
+        "60b9b66c.eef658",\r
+        "d18a7342.6feac8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5ffa37b0.a29d98",\r
+    "id": "f4cc70f5.9b6bc",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3728,\r
-    "y": 4767,\r
-    "z": "f8944603.71553",\r
+    "x": 3720.566665649414,\r
+    "y": 4778,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "4792a0c5.aeb76"\r
+        "96ee8bec.e5c4a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "78930237.780be4",\r
+    "id": "60b9b66c.eef658",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 4047,\r
-    "y": 4707,\r
-    "z": "f8944603.71553",\r
+    "x": 4039.566665649414,\r
+    "y": 4718,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "74408c25.ef5164",\r
+    "id": "eedd5a70.956fd8",\r
     "type": "comment",\r
     "name": "populate connectivity-C variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4413,\r
-    "y": 5275,\r
-    "z": "f8944603.71553",\r
+    "x": 4405.566665649414,\r
+    "y": 5286,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d1a4e2c9.15ac9",\r
+    "id": "76d94500.85b34c",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4568,\r
-    "y": 5316,\r
-    "z": "f8944603.71553",\r
+    "x": 4560.566665649414,\r
+    "y": 5327,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "748b1299.fd2144",\r
+    "id": "5f94b51d.236064",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainC-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 5011,\r
-    "y": 5364,\r
-    "z": "f8944603.71553",\r
+    "x": 5003.566665649414,\r
+    "y": 5375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "24040f90.d6a4",\r
+    "id": "66bf889f.a4f118",\r
     "type": "switchNode",\r
     "name": "switch found-secondary-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4384,\r
-    "y": 5374,\r
-    "z": "f8944603.71553",\r
+    "x": 4376.566665649414,\r
+    "y": 5385,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f8d36d32.9ac71",\r
-        "9cd0c03a.a311a"\r
+        "b509f4ce.23c808",\r
+        "425be1a9.ccccd8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f8d36d32.9ac71",\r
+    "id": "b509f4ce.23c808",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4620,\r
-    "y": 5358,\r
-    "z": "f8944603.71553",\r
+    "x": 4612.566665649414,\r
+    "y": 5369,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "d753b8f.12e03c8"\r
+        "1cce9d9d.44252a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d753b8f.12e03c8",\r
+    "id": "1cce9d9d.44252a",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4764,\r
-    "y": 5360,\r
-    "z": "f8944603.71553",\r
+    "x": 4756.566665649414,\r
+    "y": 5371,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "748b1299.fd2144",\r
-        "9643625b.90e238",\r
-        "c3f4caa.3b73cb8"\r
+        "5f94b51d.236064",\r
+        "efe8a2f7.303938",\r
+        "b992a481.10f3f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9cd0c03a.a311a",\r
+    "id": "425be1a9.ccccd8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4619,\r
-    "y": 5406,\r
-    "z": "f8944603.71553",\r
+    "x": 4611.566665649414,\r
+    "y": 5417,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9643625b.90e238",\r
+    "id": "efe8a2f7.303938",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5132,\r
-    "y": 5411,\r
-    "z": "f8944603.71553",\r
+    "x": 5124.566665649414,\r
+    "y": 5422,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c3f4caa.3b73cb8",\r
+    "id": "b992a481.10f3f",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5013.6669921875,\r
-    "y": 5496.08349609375,\r
-    "z": "f8944603.71553",\r
+    "x": 5006.233657836914,\r
+    "y": 5507.08349609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "433011d7.349ae8",\r
+    "id": "3dbfccd3.2b6904",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5014.8837890625,\r
-    "y": 5454.88330078125,\r
-    "z": "f8944603.71553",\r
+    "x": 5007.450454711914,\r
+    "y": 5465.88330078125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e2691c6e.49966",\r
+    "id": "c4e3627c.f5b198",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainC-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 5546,\r
-    "y": 5843,\r
-    "z": "f8944603.71553",\r
+    "x": 5538.566665649414,\r
+    "y": 5854,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7492e58a.da53dc",\r
+    "id": "316a2790.87ce5",\r
     "type": "switchNode",\r
     "name": "switch found-secondary-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4919,\r
-    "y": 5853,\r
-    "z": "f8944603.71553",\r
+    "x": 4911.566665649414,\r
+    "y": 5864,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "7d7daf2e.06b168",\r
-        "1dddd00a.b82ef8"\r
+        "2b91cb0d.4b878c",\r
+        "b9e860d6.0863a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7d7daf2e.06b168",\r
+    "id": "2b91cb0d.4b878c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5152,\r
-    "y": 5847,\r
-    "z": "f8944603.71553",\r
+    "x": 5144.566665649414,\r
+    "y": 5858,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "51e74c47.c309bc"\r
+        "617327bf.d18368"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "51e74c47.c309bc",\r
+    "id": "617327bf.d18368",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5299,\r
-    "y": 5855,\r
-    "z": "f8944603.71553",\r
+    "x": 5291.566665649414,\r
+    "y": 5866,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "e2691c6e.49966",\r
-        "f2071b27.722968",\r
-        "ce8449a1.6c0af8"\r
+        "c4e3627c.f5b198",\r
+        "7767e038.8b5bf",\r
+        "5189b1c7.a8726"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1dddd00a.b82ef8",\r
+    "id": "b9e860d6.0863a",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5153,\r
-    "y": 5897,\r
-    "z": "f8944603.71553",\r
+    "x": 5145.566665649414,\r
+    "y": 5908,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f2071b27.722968",\r
+    "id": "7767e038.8b5bf",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5667,\r
-    "y": 5890,\r
-    "z": "f8944603.71553",\r
+    "x": 5659.566665649414,\r
+    "y": 5901,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ce8449a1.6c0af8",\r
+    "id": "5189b1c7.a8726",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5548.6669921875,\r
-    "y": 5975.08349609375,\r
-    "z": "f8944603.71553",\r
+    "x": 5541.233657836914,\r
+    "y": 5986.08349609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6cf05b70.9ecfd4",\r
+    "id": "be3f8000.1758f8",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5549.8837890625,\r
-    "y": 5933.88330078125,\r
-    "z": "f8944603.71553",\r
+    "x": 5542.450454711914,\r
+    "y": 5944.88330078125,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b08c7802.5d204",\r
+    "id": "5021b590.5d75e4",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5080,\r
-    "y": 5803,\r
-    "z": "f8944603.71553",\r
+    "x": 5072.566665649414,\r
+    "y": 5814,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e97fbec2.db6de",\r
+    "id": "92959871.fa0e08",\r
     "type": "comment",\r
     "name": "populate connectivity-C variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4914,\r
-    "y": 5764,\r
-    "z": "f8944603.71553",\r
+    "x": 4906.566665649414,\r
+    "y": 5775,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": []\r
   },\r
   {\r
-    "id": "651a17c0.63b678",\r
+    "id": "899de386.880988",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3241.25,\r
-    "y": 6373.25,\r
-    "z": "f8944603.71553",\r
+    "x": 3233.816665649414,\r
+    "y": 6384.25,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "74077cd7.2a1a94",\r
-        "f3174188.6084b"\r
+        "1f7a42c6.29cf15",\r
+        "5608d8df.18871"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "74077cd7.2a1a94",\r
+    "id": "1f7a42c6.29cf15",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3432.25,\r
-    "y": 6377.25,\r
-    "z": "f8944603.71553",\r
+    "x": 3424.816665649414,\r
+    "y": 6388.25,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "f2351c78.3536d"\r
+        "d6990f3f.a131a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f2351c78.3536d",\r
+    "id": "d6990f3f.a131a8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3559.25,\r
-    "y": 6376.25,\r
-    "z": "f8944603.71553",\r
+    "x": 3551.816665649414,\r
+    "y": 6387.25,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "9d7f2116.baeda"\r
+        "1cb779c6.3641ce"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f3174188.6084b",\r
+    "id": "5608d8df.18871",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3428.25,\r
-    "y": 6447.25,\r
-    "z": "f8944603.71553",\r
+    "x": 3420.816665649414,\r
+    "y": 6458.25,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "84ee4e22.34786"\r
+        "9d5d9d30.3fbe28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bf4fd4bd.d3efb",\r
+    "id": "60292317.f03774",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3977.75,\r
-    "y": 6446.33349609375,\r
-    "z": "f8944603.71553",\r
+    "x": 3970.316665649414,\r
+    "y": 6457.33349609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "84ee4e22.34786",\r
+    "id": "9d5d9d30.3fbe28",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3561.75,\r
-    "y": 6449.33349609375,\r
-    "z": "f8944603.71553",\r
+    "x": 3554.316665649414,\r
+    "y": 6460.33349609375,\r
+    "z": "8bc654d2.f0dde",\r
     "wires": [\r
       [\r
-        "bf4fd4bd.d3efb"\r
+        "60292317.f03774"\r
       ]\r
     ]\r
   }\r

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-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 19a9e99..6b46d32 100644 (file)
--- 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 @@
 [\r
   {\r
-    "id": "2f28023e.39f0ce",\r
+    "id": "9b0ef60b.7214f",\r
     "type": "dgstart",\r
     "name": "DGSTART",\r
     "outputs": 1,\r
-    "x": 96.5,\r
-    "y": 107,\r
-    "z": "4138d8f7.da252",\r
+    "x": 179.56666564941406,\r
+    "y": 189.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "73cc7959.44f0a"\r
+        "fb71b372.446598"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "73cc7959.44f0a",\r
+    "id": "fb71b372.446598",\r
     "type": "service-logic",\r
     "name": "GENERIC-RESOURCE-API ${project.version}",\r
     "module": "GENERIC-RESOURCE-API",\r
@@ -22,10540 +22,10540 @@
     "comments": "",\r
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
     "outputs": 1,\r
-    "x": 380.7856903076172,\r
-    "y": 168.23810863494873,\r
-    "z": "4138d8f7.da252",\r
+    "x": 463.85235595703125,\r
+    "y": 250.52385997772217,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "22ecaa15.62efee"\r
+        "661c7873.62c16"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "22ecaa15.62efee",\r
+    "id": "661c7873.62c16",\r
     "type": "method",\r
     "name": "method cll-vnf-topology-operation-cll-modify",\r
     "xml": "<method rpc='cll-vnf-topology-operation-cll-modify' mode='sync'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 386.92860412597656,\r
-    "y": 253.00003051757812,\r
-    "z": "4138d8f7.da252",\r
+    "x": 469.9952697753906,\r
+    "y": 335.28578186035156,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c060beae.bc9e28"\r
+        "f0354603.74586"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c060beae.bc9e28",\r
+    "id": "f0354603.74586",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 736.5,\r
-    "y": 312,\r
-    "z": "4138d8f7.da252",\r
+    "x": 819.5666656494141,\r
+    "y": 394.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "915751c1.614528",\r
-        "36f6973a.34e678",\r
-        "493b4ec5.6de3"\r
+        "729f4799.a6df6",\r
+        "82d86696.e8f5a",\r
+        "381a9eda.91673a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "915751c1.614528",\r
+    "id": "729f4799.a6df6",\r
     "type": "returnSuccess",\r
     "name": "return success",\r
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
     "comments": "",\r
-    "x": 1037.83349609375,\r
-    "y": 582.9302978515625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1120.900161743164,\r
+    "y": 665.2160491943359,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "36f6973a.34e678",\r
+    "id": "82d86696.e8f5a",\r
     "type": "save",\r
     "name": "get service-instance from aai",\r
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1059.261962890625,\r
-    "y": 285.33331298828125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1142.328628540039,\r
+    "y": 367.6190643310547,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "488c3b3e.f19244",\r
-        "775f6bb9.6a72cc",\r
-        "cd7c45c1.b6f318"\r
+        "19e3f412.c2895c",\r
+        "22e3b9e.2e85d46",\r
+        "d1fd3935.e60aa8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "488c3b3e.f19244",\r
+    "id": "19e3f412.c2895c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1284.261962890625,\r
-    "y": 143.33331298828125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1367.328628540039,\r
+    "y": 225.6190643310547,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "86fe6a1f.5037f8"\r
+        "bdfafca5.bdc978"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "775f6bb9.6a72cc",\r
+    "id": "22e3b9e.2e85d46",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1279.7529296875,\r
-    "y": 212.9073486328125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1362.819595336914,\r
+    "y": 295.19309997558594,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "de07150f.9aa728"\r
+        "f555968c.0ca438"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cd7c45c1.b6f318",\r
+    "id": "d1fd3935.e60aa8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1268.261962890625,\r
-    "y": 259.33331298828125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1351.328628540039,\r
+    "y": 341.6190643310547,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "45b0306e.39dc08"\r
+        "cd958c5e.148ca8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "354c5c1b.22efdc",\r
+    "id": "60f90238.97edc4",\r
     "type": "comment",\r
     "name": "new for TransportSlicing",\r
     "info": "",\r
     "comments": "",\r
-    "x": 1038.261962890625,\r
-    "y": 173.33331298828125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1121.328628540039,\r
+    "y": 255.6190643310547,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "493b4ec5.6de3",\r
+    "id": "381a9eda.91673a",\r
     "type": "execute",\r
     "name": "execute properties",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1026.261962890625,\r
-    "y": 225.33331298828125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1109.328628540039,\r
+    "y": 307.6190643310547,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "86fe6a1f.5037f8",\r
+    "id": "bdfafca5.bdc978",\r
     "type": "switchNode",\r
     "name": "switch allotted-resources_length != 0",\r
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1524.5,\r
-    "y": 140,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1607.566665649414,\r
+    "y": 222.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ee0543f9.1cf788",\r
-        "5497352b.e1aeec"\r
+        "1d20e341.a27c1d",\r
+        "5ce58924.9a36f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "de07150f.9aa728",\r
+    "id": "f555968c.0ca438",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 1434.5623779296875,\r
-    "y": 215.85977172851562,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1517.6290435791016,\r
+    "y": 298.14552307128906,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "45b0306e.39dc08",\r
+    "id": "cd958c5e.148ca8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 1438.5,\r
-    "y": 260,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1521.566665649414,\r
+    "y": 342.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ee0543f9.1cf788",\r
+    "id": "1d20e341.a27c1d",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1729.5,\r
-    "y": 177,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1812.566665649414,\r
+    "y": 259.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6345f4d0.12f85c"\r
+        "e28a7a1e.c07b78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5497352b.e1aeec",\r
+    "id": "5ce58924.9a36f",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1739.5,\r
-    "y": 104,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1822.566665649414,\r
+    "y": 186.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6345f4d0.12f85c",\r
+    "id": "e28a7a1e.c07b78",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1722.5,\r
-    "y": 252,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1805.566665649414,\r
+    "y": 334.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c2cf8029.375a4",\r
-        "3a106a22.349b86",\r
-        "f24d529e.b55f9",\r
-        "26407648.4cfd4a",\r
-        "5e06fc8.b063184"\r
+        "fd95487b.da105",\r
+        "526e7fc2.050288",\r
+        "a11cf219.9bf18",\r
+        "8ac4fdd4.d603a8",\r
+        "c717d5f4.4fddc8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "34fb97ab.b3686",\r
+    "id": "324358a6.ea813",\r
     "type": "save",\r
     "name": "get allotted-resource from aai",\r
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2208.5,\r
-    "y": 303,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2291.566665649414,\r
+    "y": 385.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4a2e58a2.751648",\r
-        "c91e93c5.362468",\r
-        "ad2e905e.658598"\r
+        "6086efb9.edfcd",\r
+        "9b93dfe7.0d77",\r
+        "a7f7b2f5.24504"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4a2e58a2.751648",\r
+    "id": "6086efb9.edfcd",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2424.5,\r
-    "y": 370,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2507.566665649414,\r
+    "y": 452.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2d931b81.0000fc"\r
+        "a12dc51a.620ef"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c91e93c5.362468",\r
+    "id": "9b93dfe7.0d77",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2424.990966796875,\r
-    "y": 269.573974609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2508.057632446289,\r
+    "y": 351.85972595214844,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2c737e52.6b21f2"\r
+        "adc977fa.7cd608"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ad2e905e.658598",\r
+    "id": "a7f7b2f5.24504",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2420.5,\r
-    "y": 319,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2503.566665649414,\r
+    "y": 401.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "81005112.39dbe"\r
+        "4d4bdb5a.3763ac"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c2cf8029.375a4",\r
+    "id": "fd95487b.da105",\r
     "type": "for",\r
     "name": "for each allotted-resource",\r
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1925.5,\r
-    "y": 284,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2008.566665649414,\r
+    "y": 366.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9843a.b676f3c68",\r
-        "34fb97ab.b3686",\r
-        "cf6d7172.69b4b8",\r
-        "326038f4.f291a"\r
+        "cc186f28.ba2c9",\r
+        "324358a6.ea813",\r
+        "ab78fc6f.8a0998",\r
+        "1e0dcc9a.c7d15b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9843a.b676f3c68",\r
+    "id": "cc186f28.ba2c9",\r
     "type": "set",\r
     "name": "set the current allotted-resource-id",\r
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 2205.5,\r
-    "y": 222,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2288.566665649414,\r
+    "y": 304.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "26407648.4cfd4a",\r
+    "id": "8ac4fdd4.d603a8",\r
     "type": "set",\r
     "name": "set tmp.arr",\r
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",\r
     "comments": "",\r
-    "x": 1899.5,\r
-    "y": 234,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1982.566665649414,\r
+    "y": 316.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3a106a22.349b86",\r
+    "id": "526e7fc2.050288",\r
     "type": "get-resource",\r
     "name": "get-resource pnfs-list",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1942.5,\r
-    "y": 93,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2025.566665649414,\r
+    "y": 175.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f24d529e.b55f9",\r
+    "id": "a11cf219.9bf18",\r
     "type": "get-resource",\r
     "name": "get-resource logical-links",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1954.5,\r
-    "y": 134,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2037.566665649414,\r
+    "y": 216.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a7bf0e61.b8215",\r
+    "id": "2d1a927f.4e32b6",\r
     "type": "comment",\r
     "name": "The following two nodes are for PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 1979.5,\r
-    "y": 46,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2062.566665649414,\r
+    "y": 128.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "68130b3.2f48af4",\r
+    "id": "9e25d87e.938588",\r
     "type": "set",\r
     "name": "set tmp.arr",\r
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",\r
     "comments": "",\r
-    "x": 1899.5,\r
-    "y": 180,\r
-    "z": "4138d8f7.da252",\r
+    "x": 1982.566665649414,\r
+    "y": 262.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2c737e52.6b21f2",\r
+    "id": "adc977fa.7cd608",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 2603.5,\r
-    "y": 272,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2686.566665649414,\r
+    "y": 354.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "81005112.39dbe",\r
+    "id": "4d4bdb5a.3763ac",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 2603.4375,\r
-    "y": 321.1402587890625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2686.504165649414,\r
+    "y": 403.42601013183594,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2d931b81.0000fc",\r
+    "id": "a12dc51a.620ef",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2605.4375,\r
-    "y": 372.1402587890625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2688.504165649414,\r
+    "y": 454.42601013183594,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4511b10b.b4e2e8"\r
+        "e28b2f59.3a0188"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4511b10b.b4e2e8",\r
+    "id": "e28b2f59.3a0188",\r
     "type": "save",\r
     "name": "get allotted-resource relationship from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2940.4375,\r
-    "y": 141.14027404785156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3023.504165649414,\r
+    "y": 223.426025390625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9fb16699.1235d",\r
-        "da567395.79b6d8",\r
-        "8ed0fbe8.03e31"\r
+        "5b54194d.44ebe",\r
+        "aebf4283.d1be78",\r
+        "4cc0a7b0.54364"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "da567395.79b6d8",\r
+    "id": "aebf4283.d1be78",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3213.928466796875,\r
-    "y": 33.71424865722656,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3296.995132446289,\r
+    "y": 116,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1dbb6caf.82e0eb"\r
+        "bfbb6bff.50e7e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1dbb6caf.82e0eb",\r
+    "id": "bfbb6bff.50e7e8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3391.5,\r
-    "y": 34.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3474.566665649414,\r
+    "y": 116.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8ed0fbe8.03e31",\r
+    "id": "4cc0a7b0.54364",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3209.4375,\r
-    "y": 83.14027404785156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3292.504165649414,\r
+    "y": 165.426025390625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1a97687b.99c02"\r
+        "8ce95b42.618ca8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1a97687b.99c02",\r
+    "id": "8ce95b42.618ca8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3391.4375,\r
-    "y": 83.14027404785156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3474.504165649414,\r
+    "y": 165.426025390625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9fb16699.1235d",\r
+    "id": "5b54194d.44ebe",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3213.4375,\r
-    "y": 134.14027404785156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3296.504165649414,\r
+    "y": 216.426025390625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "470c276f.ad2f08"\r
+        "6f465aa6.4f1ee4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "470c276f.ad2f08",\r
+    "id": "6f465aa6.4f1ee4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3393.4375,\r
-    "y": 134.14027404785156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3476.504165649414,\r
+    "y": 216.426025390625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ece8c0f8.d3abf8"\r
+        "7a127cf4.cf8b34"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ece8c0f8.d3abf8",\r
+    "id": "7a127cf4.cf8b34",\r
     "type": "switchNode",\r
     "name": "switch allotted-resource.relationship-list not empty",\r
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2959.5,\r
-    "y": 269.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3042.566665649414,\r
+    "y": 351.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "dba346c3.39c8a8",\r
-        "4ccdd4a0.9c665c"\r
+        "9cc4aaf6.859c",\r
+        "9d86e661.45c7f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4ccdd4a0.9c665c",\r
+    "id": "9d86e661.45c7f",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3269.5,\r
-    "y": 276.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3352.566665649414,\r
+    "y": 358.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "dba346c3.39c8a8",\r
+    "id": "9cc4aaf6.859c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3268.5,\r
-    "y": 330.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3351.566665649414,\r
+    "y": 412.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e2cad6e.ad95028"\r
+        "c9c4f2a.9305f9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fde9905b.0e0dc",\r
+    "id": "af10f438.0ffb48",\r
     "type": "outcome",\r
     "name": "network-policy",\r
     "xml": "<outcome value='network-policy'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4013.5,\r
-    "y": 284.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4096.566665649414,\r
+    "y": 366.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "be0ed66c.68b118"\r
+        "96cf18f1.1cad5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be0ed66c.68b118",\r
+    "id": "96cf18f1.1cad5",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4190.4998779296875,\r
-    "y": 276.99989318847656,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4273.566543579102,\r
+    "y": 359.28564453125,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1aebcc98.e81703",\r
-        "a36c8474.3e9148"\r
+        "c590372d.ec562",\r
+        "d84bff3f.0a18c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e2cad6e.ad95028",\r
+    "id": "c9c4f2a.9305f9",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3432.5,\r
-    "y": 256.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3515.566665649414,\r
+    "y": 338.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f52b5162.d3155",\r
-        "28c7d65.67fb0aa"\r
+        "ec6a7a84.d65408",\r
+        "7d25e53c.8a468c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f52b5162.d3155",\r
+    "id": "ec6a7a84.d65408",\r
     "type": "for",\r
     "name": "for each allotted-resource relationship",\r
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3713.5,\r
-    "y": 212.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3796.566665649414,\r
+    "y": 294.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "40678a93.0b11fc"\r
+        "7204f6fc.5ab2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "40678a93.0b11fc",\r
+    "id": "7204f6fc.5ab2",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3975.5,\r
-    "y": 212.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4058.566665649414,\r
+    "y": 294.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "fde9905b.0e0dc"\r
+        "af10f438.0ffb48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1aebcc98.e81703",\r
+    "id": "c590372d.ec562",\r
     "type": "set",\r
     "name": "set the 1st network-policy-id",\r
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4433.4998779296875,\r
-    "y": 233.99989318847656,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4516.566543579102,\r
+    "y": 316.28564453125,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a36c8474.3e9148",\r
+    "id": "d84bff3f.0a18c8",\r
     "type": "save",\r
     "name": "get network-policy from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4422.4998779296875,\r
-    "y": 288.99989318847656,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4505.566543579102,\r
+    "y": 371.28564453125,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f4703396.8f997",\r
-        "c4863aea.39d3c",\r
-        "3f105248.ebf0a6"\r
+        "bcf7cb3d.813c08",\r
+        "241d629e.3937f6",\r
+        "ab4a02d2.dd63f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3f105248.ebf0a6",\r
+    "id": "ab4a02d2.dd63f8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4753.5,\r
-    "y": 197,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4836.566665649414,\r
+    "y": 279.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f39e3f38.4d2868"\r
+        "6fe3d858.7ad19"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f39e3f38.4d2868",\r
+    "id": "6fe3d858.7ad19",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4902.071533203125,\r
-    "y": 197.2857666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4985.138198852539,\r
+    "y": 279.57151794433594,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9b475b7a.781198",\r
+    "id": "3cab2fad.4b6d28",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 4901.009033203125,\r
-    "y": 241.426025390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4984.075698852539,\r
+    "y": 323.71177673339844,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c4863aea.39d3c",\r
+    "id": "241d629e.3937f6",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4742.009033203125,\r
-    "y": 241.426025390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4825.075698852539,\r
+    "y": 323.71177673339844,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9b475b7a.781198"\r
+        "3cab2fad.4b6d28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f4703396.8f997",\r
+    "id": "bcf7cb3d.813c08",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4749.009033203125,\r
-    "y": 320.426025390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4832.075698852539,\r
+    "y": 402.71177673339844,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a4728a38.a45e8"\r
+        "c61a87d8.32a11"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a4728a38.a45e8",\r
+    "id": "c61a87d8.32a11",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4888.009033203125,\r
-    "y": 320.426025390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4971.075698852539,\r
+    "y": 402.71177673339844,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6805f17a.2a0698",\r
-        "a9ae4e95.32ef88"\r
+        "ab565ac9.d97978",\r
+        "cf0bc947.03a4d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6805f17a.2a0698",\r
+    "id": "ab565ac9.d97978",\r
     "type": "set",\r
     "name": "set the max bandwidth",\r
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
     "comments": "",\r
-    "x": 5093.5,\r
-    "y": 318,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5176.566665649414,\r
+    "y": 400.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a9ae4e95.32ef88",\r
+    "id": "cf0bc947.03a4d",\r
     "type": "set",\r
     "name": "set the max bandwidth",\r
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
     "comments": "",\r
-    "x": 5092.5,\r
-    "y": 364,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5175.566665649414,\r
+    "y": 446.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "28c7d65.67fb0aa",\r
+    "id": "7d25e53c.8a468c",\r
     "type": "for",\r
     "name": "for each allotted-resource relationship",\r
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3530.5,\r
-    "y": 328.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3613.566665649414,\r
+    "y": 410.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ebdf975.aa03968"\r
+        "95ed8dc.322967"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ebdf975.aa03968",\r
+    "id": "95ed8dc.322967",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3810.5,\r
-    "y": 328.00001525878906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3893.566665649414,\r
+    "y": 410.2857666015625,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3f67ae4e.a2076a"\r
+        "e85bd9f4.7a28d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3f67ae4e.a2076a",\r
+    "id": "e85bd9f4.7a28d",\r
     "type": "outcome",\r
     "name": "logical-link",\r
     "xml": "<outcome value='logical-link'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2181.5001220703125,\r
-    "y": 759.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2264.5667877197266,\r
+    "y": 841.2858734130859,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f83af2f7.dfb288"\r
+        "53210c7d.ec4f8c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f83af2f7.dfb288",\r
+    "id": "53210c7d.ec4f8c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2358.5,\r
-    "y": 752,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2441.566665649414,\r
+    "y": 834.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a0742463.c2c6f8",\r
-        "25034b30.dd6634"\r
+        "6d10b617.947758",\r
+        "dd67d7f2.9348e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a0742463.c2c6f8",\r
+    "id": "6d10b617.947758",\r
     "type": "set",\r
     "name": "set the current logical-link-name",\r
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 2601.5,\r
-    "y": 709,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2684.566665649414,\r
+    "y": 791.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "25034b30.dd6634",\r
+    "id": "dd67d7f2.9348e",\r
     "type": "save",\r
     "name": "get logical-link from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2590.5,\r
-    "y": 764,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2673.566665649414,\r
+    "y": 846.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b3267bc2.0ab17",\r
-        "e3342c37.4e1e3",\r
-        "349e46c.d16cb3a"\r
+        "7e4e9434.83a0d4",\r
+        "9cee4acb.003668",\r
+        "47c07099.1b14a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b3267bc2.0ab17",\r
+    "id": "7e4e9434.83a0d4",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2881.990966796875,\r
-    "y": 742.573974609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2965.057632446289,\r
+    "y": 824.8597259521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "504883f4.bc132c"\r
+        "bc050886.d2a05"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e3342c37.4e1e3",\r
+    "id": "9cee4acb.003668",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2870.5,\r
-    "y": 787,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2953.566665649414,\r
+    "y": 869.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6ff791fd.bff34"\r
+        "c31212b9.83f5f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "504883f4.bc132c",\r
+    "id": "bc050886.d2a05",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3030.5625,\r
-    "y": 742.8597412109375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3113.629165649414,\r
+    "y": 825.1454925537109,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6ff791fd.bff34",\r
+    "id": "c31212b9.83f5f8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3029.5,\r
-    "y": 787,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3112.566665649414,\r
+    "y": 869.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "349e46c.d16cb3a",\r
+    "id": "47c07099.1b14a8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2877.5,\r
-    "y": 866,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2960.566665649414,\r
+    "y": 948.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "947e25fa.d00b28"\r
+        "a66b0cd4.00b53"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "947e25fa.d00b28",\r
+    "id": "a66b0cd4.00b53",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3016.5,\r
-    "y": 866,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3099.566665649414,\r
+    "y": 948.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b5aabe11.88e5f",\r
-        "8b8aaeb1.46c568",\r
-        "32905edb.461e7a",\r
-        "2f0ef70c.178628",\r
-        "6eaf37e0.1fb3a8",\r
-        "1abb3e71.7e1362",\r
-        "29e42279.9aaa7e",\r
-        "363ba934.edbd4e",\r
-        "ec67f0f.b56539",\r
-        "631e76e1.71afc",\r
-        "b17f4ff2.75d93",\r
-        "8048035e.723ef",\r
-        "d590aba5.94aa48",\r
-        "44b9c5d0.dda044",\r
-        "46e10049.e35348",\r
-        "f55201f.0be188",\r
-        "6834572.668ee28",\r
-        "fa7f428c.6d6b2",\r
-        "8c5d257.6a579d8"\r
+        "628231dc.fe1998",\r
+        "40f53355.15a3d4",\r
+        "6e7728cd.6d606",\r
+        "591f4762.52be1",\r
+        "72ab083b.a6528",\r
+        "be414195.9b77c",\r
+        "8abc6705.827928",\r
+        "5f587418.c46734",\r
+        "da60761c.d9f04",\r
+        "fd9bd7ab.c92bd8",\r
+        "b37c5dee.6ca208",\r
+        "1bc9df09.d67e59",\r
+        "6e895a21.1d4594",\r
+        "707a9dca.527c64",\r
+        "9cc0dadb.189ef",\r
+        "e9c6a99.90dcbd8",\r
+        "4a92500a.dfe688",\r
+        "25934f35.38edd",\r
+        "77f3463a.2b447"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "479d6fca.4b7c8",\r
+    "id": "b0809281.c581e8",\r
     "type": "execute",\r
     "name": "execute UUID generator for ethernet-service-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3328.5,\r
-    "y": 416,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3411.566665649414,\r
+    "y": 498.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b5aabe11.88e5f",\r
+    "id": "628231dc.fe1998",\r
     "type": "execute",\r
     "name": "execute UUID generator for otn-tunnel-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3315.4998779296875,\r
-    "y": 508,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3398.5665435791016,\r
+    "y": 590.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "44b9c5d0.dda044",\r
+    "id": "707a9dca.527c64",\r
     "type": "set",\r
     "name": "set new ethernet-service-name",\r
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3272.4998779296875,\r
-    "y": 553,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3355.5665435791016,\r
+    "y": 635.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8b8aaeb1.46c568",\r
+    "id": "40f53355.15a3d4",\r
     "type": "set",\r
     "name": "set network-route-one",\r
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3247.4998779296875,\r
-    "y": 616,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3330.5665435791016,\r
+    "y": 698.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "32905edb.461e7a",\r
+    "id": "6e7728cd.6d606",\r
     "type": "set",\r
     "name": "set network-route-two",\r
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3248.4998779296875,\r
-    "y": 671,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3331.5665435791016,\r
+    "y": 753.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2f0ef70c.178628",\r
+    "id": "591f4762.52be1",\r
     "type": "save",\r
     "name": "get network-route-one from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3264.4998779296875,\r
-    "y": 719,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3347.5665435791016,\r
+    "y": 801.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "99eab0f2.3508c",\r
-        "1b8f4bea.ec5e94",\r
-        "fc9653f8.4449d"\r
+        "6d204f19.ffc268",\r
+        "1689d04b.d0aa98",\r
+        "34ef36cb.86ebd2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6eaf37e0.1fb3a8",\r
+    "id": "72ab083b.a6528",\r
     "type": "save",\r
     "name": "get network-route-two from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3259.5,\r
-    "y": 785.9998779296875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3342.566665649414,\r
+    "y": 868.2856292724609,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e805b604.ab84e",\r
-        "a86f3b5b.e29e1",\r
-        "cbb70d3d.0ef6a"\r
+        "a5360717.582308",\r
+        "a764163a.8df268",\r
+        "84d2b76f.25f11"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "99eab0f2.3508c",\r
+    "id": "6d204f19.ffc268",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3505.5,\r
-    "y": 547,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3588.566665649414,\r
+    "y": 629.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d6e995cd.85fc"\r
+        "424235f5.63bc3c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1b8f4bea.ec5e94",\r
+    "id": "1689d04b.d0aa98",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3501.009033203125,\r
-    "y": 596.426025390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3584.075698852539,\r
+    "y": 678.7117767333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e5161935.335138"\r
+        "3044babb.9a7f0e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fc9653f8.4449d",\r
+    "id": "34ef36cb.86ebd2",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3505.009033203125,\r
-    "y": 649.426025390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3588.075698852539,\r
+    "y": 731.7117767333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "867b315e.a11f4"\r
+        "e8786087.fc4a5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d6e995cd.85fc",\r
+    "id": "424235f5.63bc3c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3654.071533203125,\r
-    "y": 546.2857666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3737.138198852539,\r
+    "y": 628.5715179443359,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e5161935.335138",\r
+    "id": "3044babb.9a7f0e",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3644.009033203125,\r
-    "y": 596.426025390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3727.075698852539,\r
+    "y": 678.7117767333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e805b604.ab84e",\r
+    "id": "a5360717.582308",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3509.5,\r
-    "y": 702.9998779296875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3592.566665649414,\r
+    "y": 785.2856292724609,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f25db7d5.d2a2a"\r
+        "d832daa6.408e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a86f3b5b.e29e1",\r
+    "id": "a764163a.8df268",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3505.009033203125,\r
-    "y": 752.4259033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3588.075698852539,\r
+    "y": 834.7116546630859,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "86e45032.893578"\r
+        "b0e5525.e8ef43"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cbb70d3d.0ef6a",\r
+    "id": "84d2b76f.25f11",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3488.009033203125,\r
-    "y": 800.4259033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3571.075698852539,\r
+    "y": 882.7116546630859,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "20619d71.889cda"\r
+        "8b568989.b50038"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f25db7d5.d2a2a",\r
+    "id": "d832daa6.408e",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3658.071533203125,\r
-    "y": 702.28564453125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3741.138198852539,\r
+    "y": 784.5713958740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "86e45032.893578",\r
+    "id": "b0e5525.e8ef43",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3648.009033203125,\r
-    "y": 752.4259033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3731.075698852539,\r
+    "y": 834.7116546630859,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "867b315e.a11f4",\r
+    "id": "e8786087.fc4a5",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3666.5,\r
-    "y": 649,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3749.566665649414,\r
+    "y": 731.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2bd95045.b71158"\r
+        "66efb3a1.9fe73c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "20619d71.889cda",\r
+    "id": "8b568989.b50038",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3641.5,\r
-    "y": 799.9998779296875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3724.566665649414,\r
+    "y": 882.2856292724609,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "41de01b2.960a08"\r
+        "26894e1f.239b9a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2bd95045.b71158",\r
+    "id": "66efb3a1.9fe73c",\r
     "type": "switchNode",\r
     "name": "switch nr type",\r
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3838.5,\r
-    "y": 649,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3921.566665649414,\r
+    "y": 731.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6f8555c6.ec1a0c",\r
-        "994a0acf.d3aed8",\r
-        "26a90c3.2a56674"\r
+        "a22f1b0d.edd33",\r
+        "ab951b61.cb4cb8",\r
+        "79c99b01.4060a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "41de01b2.960a08",\r
+    "id": "26894e1f.239b9a",\r
     "type": "switchNode",\r
     "name": "switch nr type",\r
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3833.5,\r
-    "y": 734,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3916.566665649414,\r
+    "y": 816.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4b5b1a17.b9df6c",\r
-        "d7a475f3.ea12c",\r
-        "16154f9d.14a3b"\r
+        "a2c3d250.fc00d",\r
+        "aa59cf58.a145d8",\r
+        "fb5e94da.526bd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6f8555c6.ec1a0c",\r
+    "id": "a22f1b0d.edd33",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3999.49951171875,\r
-    "y": 385,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4082.566177368164,\r
+    "y": 467.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "62760f41.c93a2"\r
+        "2bc1e64e.d59032"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "994a0acf.d3aed8",\r
+    "id": "ab951b61.cb4cb8",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4001.49951171875,\r
-    "y": 439,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4084.566177368164,\r
+    "y": 521.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "273e3fee.2bc13"\r
+        "453522b8.5dbac4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4b5b1a17.b9df6c",\r
+    "id": "a2c3d250.fc00d",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4014.499267578125,\r
-    "y": 607,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4097.565933227539,\r
+    "y": 689.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "244a1c4c.c64574"\r
+        "f5a4f507.86b44"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d7a475f3.ea12c",\r
+    "id": "aa59cf58.a145d8",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4016.499267578125,\r
-    "y": 661,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4099.565933227539,\r
+    "y": 743.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f48105e4.f03428"\r
+        "8148cd30.75333"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "92f3b868.34ce6",\r
+    "id": "fcdd9b76.8fa5f8",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4309.49951171875,\r
-    "y": 337,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4392.566177368164,\r
+    "y": 419.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b6002239.68b828",\r
+    "id": "a44710c1.f4b4c8",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4302.49951171875,\r
-    "y": 435,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4385.566177368164,\r
+    "y": 517.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "55137534.cd97cc",\r
+    "id": "5b86250b.1183b4",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4378.499267578125,\r
-    "y": 634,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4461.565933227539,\r
+    "y": 716.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ba173e3c.d3cf48",\r
+    "id": "154b4953.ab9fcf",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4382.499267578125,\r
-    "y": 727,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4465.565933227539,\r
+    "y": 809.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4d8d5caa.cdd3ac",\r
+    "id": "3bb3037a.178754",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3460.5,\r
-    "y": 1150,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3543.566665649414,\r
+    "y": 1232.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6c40f2a8.47da04"\r
+        "10e4f75f.914479"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f63967f8.5c1d2",\r
+    "id": "8000d000.35dfa8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3469.990966796875,\r
-    "y": 1192.5740356445312,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3553.057632446289,\r
+    "y": 1274.8597869873047,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "cba887b8.3ba25"\r
+        "c201e6b8.a3178"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f4c1be52.25da4",\r
+    "id": "89805004.2ac398",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3458.5,\r
-    "y": 1239,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3541.566665649414,\r
+    "y": 1321.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "43b1688f.a5b798"\r
+        "f43a00.5422b6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f87008d1.14dd28",\r
+    "id": "7d1a072.a69ea78",\r
     "type": "comment",\r
     "name": "Question?",\r
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
     "comments": "",\r
-    "x": 3160.5,\r
-    "y": 1112,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3243.566665649414,\r
+    "y": 1194.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "29e42279.9aaa7e",\r
+    "id": "8abc6705.827928",\r
     "type": "save",\r
     "name": "get p-interface-src from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3203.5,\r
-    "y": 1177,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3286.566665649414,\r
+    "y": 1259.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4d8d5caa.cdd3ac",\r
-        "f63967f8.5c1d2",\r
-        "f4c1be52.25da4"\r
+        "3bb3037a.178754",\r
+        "8000d000.35dfa8",\r
+        "89805004.2ac398"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1abb3e71.7e1362",\r
+    "id": "be414195.9b77c",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3192.5,\r
-    "y": 1027,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3275.566665649414,\r
+    "y": 1109.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "252648ef.3d7f4",\r
-        "296ca11d.a31fd6"\r
+        "c53ee6d9.d92aa8",\r
+        "b00b21f6.61a17"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "296ca11d.a31fd6",\r
+    "id": "b00b21f6.61a17",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3415.5,\r
-    "y": 1013,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3498.566665649414,\r
+    "y": 1095.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2479711d.5bdd66"\r
+        "42f02ac3.9ec4a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "252648ef.3d7f4",\r
+    "id": "c53ee6d9.d92aa8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3417.5,\r
-    "y": 1046,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3500.566665649414,\r
+    "y": 1128.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "90f53fd9.1cbe8"\r
+        "dd03ebfe.8dbb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6c40f2a8.47da04",\r
+    "id": "10e4f75f.914479",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3633.16650390625,\r
-    "y": 1149,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3716.233169555664,\r
+    "y": 1231.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1415c282.916e3d",\r
-        "2cb5ed40.b34f42"\r
+        "e44801ab.1590c8",\r
+        "fa4a5699.5e244"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cba887b8.3ba25",\r
+    "id": "c201e6b8.a3178",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3623.5623779296875,\r
-    "y": 1195.8597717285156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3706.6290435791016,\r
+    "y": 1278.145523071289,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "43b1688f.a5b798",\r
+    "id": "f43a00.5422b6",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3627.5,\r
-    "y": 1240,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3710.566665649414,\r
+    "y": 1322.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1415c282.916e3d",\r
+    "id": "e44801ab.1590c8",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3897.5,\r
-    "y": 1200,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3980.566665649414,\r
+    "y": 1282.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3e280d70.843922",\r
-        "95fc8503.11868"\r
+        "16568eac.f132a9",\r
+        "e40b1917.8979d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "95fc8503.11868",\r
+    "id": "e40b1917.8979d8",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4073.5,\r
-    "y": 1250,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4156.566665649414,\r
+    "y": 1332.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "dc902b38.0c7748"\r
+        "ac556463.ec12b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3e280d70.843922",\r
+    "id": "16568eac.f132a9",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4075.5,\r
-    "y": 1314,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4158.566665649414,\r
+    "y": 1396.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "23310562.1afb82"\r
+        "97de31bb.b9a118"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "23310562.1afb82",\r
+    "id": "97de31bb.b9a118",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 4237.5,\r
-    "y": 1310,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4320.566665649414,\r
+    "y": 1392.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dc902b38.0c7748",\r
+    "id": "ac556463.ec12b8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4238.5,\r
-    "y": 1247,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4321.566665649414,\r
+    "y": 1329.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "cee16453.63cf3",\r
-        "84ccdaef.588b08"\r
+        "3ab9a413.979aa4",\r
+        "75cbb82a.35584"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "90f53fd9.1cbe8",\r
+    "id": "dd03ebfe.8dbb",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 3560.5,\r
-    "y": 1043,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3643.566665649414,\r
+    "y": 1125.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2479711d.5bdd66",\r
+    "id": "42f02ac3.9ec4a4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3563.5,\r
-    "y": 1006,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3646.566665649414,\r
+    "y": 1088.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e0731aec.1d3d18",\r
-        "ff49f858.b54118"\r
+        "6046ec7d.2c3dac",\r
+        "942aecd4.e6d53"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e0731aec.1d3d18",\r
+    "id": "6046ec7d.2c3dac",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",\r
     "comments": "",\r
-    "x": 3737.5,\r
-    "y": 962,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3820.566665649414,\r
+    "y": 1044.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2cb5ed40.b34f42",\r
+    "id": "fa4a5699.5e244",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3609.5,\r
-    "y": 1331,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3692.566665649414,\r
+    "y": 1413.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f5d98ba7.1e5cb8"\r
+        "5ae5afb9.f0afa"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5d98ba7.1e5cb8",\r
+    "id": "5ae5afb9.f0afa",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3890.5,\r
-    "y": 1326,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3973.566665649414,\r
+    "y": 1408.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "287b5bf8.99c79c"\r
+        "cfb3ee78.011c4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "287b5bf8.99c79c",\r
+    "id": "cfb3ee78.011c4",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4201.78564453125,\r
-    "y": 1400.82177734375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4284.852310180664,\r
+    "y": 1483.1075286865234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "70c360c1.95da08"\r
+        "658c69d5.ac8cf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ff49f858.b54118",\r
+    "id": "942aecd4.e6d53",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3752.5,\r
-    "y": 1073,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3835.566665649414,\r
+    "y": 1155.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "dadb26c7.629ca8",\r
-        "f63867c7.23e9a8",\r
-        "b7f169a7.e4cea8"\r
+        "7f200322.76207c",\r
+        "80c4e01c.7c07b8",\r
+        "71ab8804.94dd5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dadb26c7.629ca8",\r
+    "id": "7f200322.76207c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3948.0001220703125,\r
-    "y": 1025,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4031.0667877197266,\r
+    "y": 1107.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "56281278.4a732c"\r
+        "a99ba4fa.4ed1e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f63867c7.23e9a8",\r
+    "id": "80c4e01c.7c07b8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3940.0001220703125,\r
-    "y": 1080,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4023.0667877197266,\r
+    "y": 1162.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d5d18730.ffaa"\r
+        "848293a0.71bc7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b7f169a7.e4cea8",\r
+    "id": "71ab8804.94dd5",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3945.0001220703125,\r
-    "y": 1137,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4028.0667877197266,\r
+    "y": 1219.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "5b7993c9.ffe6c4"\r
+        "f97b023f.267278"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5b7993c9.ffe6c4",\r
+    "id": "f97b023f.267278",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4097.0001220703125,\r
-    "y": 1138,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4180.066787719727,\r
+    "y": 1220.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d5d18730.ffaa",\r
+    "id": "848293a0.71bc7",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4108.0001220703125,\r
-    "y": 1083,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4191.066787719727,\r
+    "y": 1165.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "56281278.4a732c",\r
+    "id": "a99ba4fa.4ed1e8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4092.3824462890625,\r
-    "y": 1022.6556701660156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4175.449111938477,\r
+    "y": 1104.941421508789,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "98511029.380fd"\r
+        "b504251b.7f7448"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "98511029.380fd",\r
+    "id": "b504251b.7f7448",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4315.500244140625,\r
-    "y": 1161,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4398.566909790039,\r
+    "y": 1243.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1e482e0.3b3ba52"\r
+        "52eb8aa1.8ff274"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "84ccdaef.588b08",\r
+    "id": "75cbb82a.35584",\r
     "type": "set",\r
     "name": "set ltpId",\r
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",\r
     "comments": "",\r
-    "x": 4408.5,\r
-    "y": 1205,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4491.566665649414,\r
+    "y": 1287.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cee16453.63cf3",\r
+    "id": "3ab9a413.979aa4",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",\r
     "comments": "",\r
-    "x": 4409.5,\r
-    "y": 1313,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4492.566665649414,\r
+    "y": 1395.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d2b67ee9.016d4",\r
+    "id": "b9ee3c01.a1e29",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
     "comments": "",\r
-    "x": 4410.5,\r
-    "y": 1262,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4493.566665649414,\r
+    "y": 1344.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "70c360c1.95da08",\r
+    "id": "658c69d5.ac8cf",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4408.6171875,\r
-    "y": 1401.34033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4491.683853149414,\r
+    "y": 1483.6260833740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8b810a1.45408f8",\r
-        "389752e1.54c2be",\r
-        "e0be029e.19d278"\r
+        "aadf2b0a.6db3d",\r
+        "61bc8b6e.22a73c",\r
+        "30cdefe5.b26318"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8b810a1.45408f8",\r
+    "id": "aadf2b0a.6db3d",\r
     "type": "set",\r
     "name": "set source ttp-id",\r
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 4623.6171875,\r
-    "y": 1363.34033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4706.683853149414,\r
+    "y": 1445.6260833740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "389752e1.54c2be",\r
+    "id": "61bc8b6e.22a73c",\r
     "type": "get-resource",\r
     "name": "get-resource src TTP",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4620.6171875,\r
-    "y": 1402.34033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4703.683853149414,\r
+    "y": 1484.6260833740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "38942ae1.d34c76"\r
+        "fd577e5f.db1ba"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e0be029e.19d278",\r
+    "id": "30cdefe5.b26318",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4576.1171875,\r
-    "y": 1444.34033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4659.183853149414,\r
+    "y": 1526.6260833740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "38942ae1.d34c76",\r
+    "id": "fd577e5f.db1ba",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4801.1171875,\r
-    "y": 1401.34033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4884.183853149414,\r
+    "y": 1483.6260833740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "418b10aa.3bf41"\r
+        "fa2d5efd.88ba08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "28737ab1.66c06e",\r
+    "id": "ded6fafe.4074f8",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4713.500244140625,\r
-    "y": 1165,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4796.566909790039,\r
+    "y": 1247.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "813fb276.a89d38"\r
+        "afabdc9f.6d39f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "813fb276.a89d38",\r
+    "id": "afabdc9f.6d39f8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4890.500244140625,\r
-    "y": 1157,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4973.566909790039,\r
+    "y": 1239.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "5ba45898.1ae6d8",\r
-        "82500988.df7418"\r
+        "d564a26c.9a8558",\r
+        "3ff41e19.f0e01a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1e482e0.3b3ba52",\r
+    "id": "52eb8aa1.8ff274",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4510.500244140625,\r
-    "y": 1161,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4593.566909790039,\r
+    "y": 1243.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "28737ab1.66c06e",\r
-        "431c2963.374ce8"\r
+        "ded6fafe.4074f8",\r
+        "f56e57c9.6506a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "431c2963.374ce8",\r
+    "id": "f56e57c9.6506a8",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4579.500244140625,\r
-    "y": 1235,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4662.566909790039,\r
+    "y": 1317.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d3fb7afe.dba838"\r
+        "f21dcf5d.336178"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d3fb7afe.dba838",\r
+    "id": "f21dcf5d.336178",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4775.500244140625,\r
-    "y": 1235,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4858.566909790039,\r
+    "y": 1317.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "40663368.ea789c"\r
+        "132ca45a.eb5e34"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "418b10aa.3bf41",\r
+    "id": "fa2d5efd.88ba08",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4959.1171875,\r
-    "y": 1401.34033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5042.183853149414,\r
+    "y": 1483.6260833740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ec468881.ecbf18"\r
+        "b951f264.559ce"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ec468881.ecbf18",\r
+    "id": "b951f264.559ce",\r
     "type": "set",\r
     "name": "set source tunnel tp ip",\r
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",\r
     "comments": "",\r
-    "x": 5166.1171875,\r
-    "y": 1401.34033203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5249.183853149414,\r
+    "y": 1483.6260833740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "82500988.df7418",\r
+    "id": "3ff41e19.f0e01a",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5115.500244140625,\r
-    "y": 1153,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5198.566909790039,\r
+    "y": 1235.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9dd65188.ffecf",\r
-        "e0664fc.7b8393",\r
-        "b7a2fd6c.7b7688"\r
+        "a40a7be5.2be498",\r
+        "d6b97145.3bf148",\r
+        "ea85892.20b4178"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5ba45898.1ae6d8",\r
+    "id": "d564a26c.9a8558",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainA id",\r
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5145.500244140625,\r
-    "y": 1101,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5228.566909790039,\r
+    "y": 1183.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9dd65188.ffecf",\r
+    "id": "a40a7be5.2be498",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5325.500244140625,\r
-    "y": 1144,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5408.566909790039,\r
+    "y": 1226.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2d529b4.18963e4"\r
+        "d68ba68a.be89b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e0664fc.7b8393",\r
+    "id": "d6b97145.3bf148",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5317.500244140625,\r
-    "y": 1199,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5400.566909790039,\r
+    "y": 1281.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3aa5c8f4.350c08"\r
+        "7c894f76.5a638"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b7a2fd6c.7b7688",\r
+    "id": "ea85892.20b4178",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5322.500244140625,\r
-    "y": 1256,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5405.566909790039,\r
+    "y": 1338.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2908da09.77d2fe"\r
+        "d37deda4.10b24"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2908da09.77d2fe",\r
+    "id": "d37deda4.10b24",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5474.500244140625,\r
-    "y": 1257,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5557.566909790039,\r
+    "y": 1339.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3aa5c8f4.350c08",\r
+    "id": "7c894f76.5a638",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5485.500244140625,\r
-    "y": 1202,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5568.566909790039,\r
+    "y": 1284.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2d529b4.18963e4",\r
+    "id": "d68ba68a.be89b8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5469.882568359375,\r
-    "y": 1141.6556701660156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5552.949234008789,\r
+    "y": 1223.941421508789,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e508aa99.ed11b8"\r
+        "ff0f9afc.082318"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "40663368.ea789c",\r
+    "id": "132ca45a.eb5e34",\r
     "type": "set",\r
     "name": "set domainA ethernet layer network-id",\r
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5038.500244140625,\r
-    "y": 1238,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5121.566909790039,\r
+    "y": 1320.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e508aa99.ed11b8",\r
+    "id": "ff0f9afc.082318",\r
     "type": "set",\r
     "name": "set controller domainA data",\r
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
     "comments": "",\r
-    "x": 5656.500244140625,\r
-    "y": 1138,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5739.566909790039,\r
+    "y": 1220.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e66147a6.9621b",\r
+    "id": "c100f1cf.959b9",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4297.49951171875,\r
-    "y": 373,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4380.566177368164,\r
+    "y": 455.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7411318a.e1b958",\r
+    "id": "476d7cc2.2b9e3c",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4288.49951171875,\r
-    "y": 471,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4371.566177368164,\r
+    "y": 553.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "62760f41.c93a2",\r
+    "id": "2bc1e64e.d59032",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4122.49951171875,\r
-    "y": 379,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4205.566177368164,\r
+    "y": 461.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "92f3b868.34ce6",\r
-        "e66147a6.9621b"\r
+        "fcdd9b76.8fa5f8",\r
+        "c100f1cf.959b9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "273e3fee.2bc13",\r
+    "id": "453522b8.5dbac4",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4128.49951171875,\r
-    "y": 443,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4211.566177368164,\r
+    "y": 525.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b6002239.68b828",\r
-        "7411318a.e1b958"\r
+        "a44710c1.f4b4c8",\r
+        "476d7cc2.2b9e3c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "244a1c4c.c64574",\r
+    "id": "f5a4f507.86b44",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4142.499267578125,\r
-    "y": 607,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4225.565933227539,\r
+    "y": 689.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "55137534.cd97cc",\r
-        "94e7efd7.f5ec88"\r
+        "5b86250b.1183b4",\r
+        "ee4f808.01bcf8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f48105e4.f03428",\r
+    "id": "8148cd30.75333",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4145.499267578125,\r
-    "y": 660,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4228.565933227539,\r
+    "y": 742.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ba173e3c.d3cf48",\r
-        "9c20a9f9.7c2ff"\r
+        "154b4953.ab9fcf",\r
+        "f5de4dab.b0e37"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "94e7efd7.f5ec88",\r
+    "id": "ee4f808.01bcf8",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4364.499267578125,\r
-    "y": 674,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4447.565933227539,\r
+    "y": 756.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9c20a9f9.7c2ff",\r
+    "id": "f5de4dab.b0e37",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4367.499267578125,\r
-    "y": 765,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4450.565933227539,\r
+    "y": 847.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "124feda4.be759a",\r
+    "id": "fba24b6a.44ade",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3523.5,\r
-    "y": 1711,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3606.566665649414,\r
+    "y": 1793.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e1f69d4c.5b8868",\r
-        "d4ae5d82.aab8b"\r
+        "6ab1e648.0c2108",\r
+        "e98d774e.c7639"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7a356795.78dec",\r
+    "id": "e055a781.15033",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3350.83349609375,\r
-    "y": 1712,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3433.900161743164,\r
+    "y": 1794.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "124feda4.be759a"\r
+        "fba24b6a.44ade"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c62c11ee.d3432",\r
+    "id": "33450ab2.d72e86",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3360.324462890625,\r
-    "y": 1754.5740356445312,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3443.391128540039,\r
+    "y": 1836.8597869873047,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4d29ec31.00d144"\r
+        "279c15e9.8df2d2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fa667208.2a7ec",\r
+    "id": "14684e53.bc0682",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3348.83349609375,\r
-    "y": 1801,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3431.900161743164,\r
+    "y": 1883.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "577a09e9.8378d8"\r
+        "7cf32ea0.24f2e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4d29ec31.00d144",\r
+    "id": "279c15e9.8df2d2",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3513.8958740234375,\r
-    "y": 1757.8597717285156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3596.9625396728516,\r
+    "y": 1840.145523071289,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "577a09e9.8378d8",\r
+    "id": "7cf32ea0.24f2e8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3517.83349609375,\r
-    "y": 1802,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3600.900161743164,\r
+    "y": 1884.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e1f69d4c.5b8868",\r
+    "id": "6ab1e648.0c2108",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3809.83349609375,\r
-    "y": 1715.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3892.900161743164,\r
+    "y": 1797.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "67e03e9f.e657f8",\r
-        "8f6dd9a8.907078"\r
+        "daabf3e5.97bed8",\r
+        "1e7b26c7.e7a121"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8f6dd9a8.907078",\r
+    "id": "1e7b26c7.e7a121",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4032.83349609375,\r
-    "y": 1670.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4115.900161743164,\r
+    "y": 1752.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9d5c402b.afbc18"\r
+        "acfb9237.1cd6c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "67e03e9f.e657f8",\r
+    "id": "daabf3e5.97bed8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4034.83349609375,\r
-    "y": 1734.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4117.900161743164,\r
+    "y": 1816.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b1dc0c2e.2db02"\r
+        "2bdd8bed.c7bcd4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b1dc0c2e.2db02",\r
+    "id": "2bdd8bed.c7bcd4",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 4193.83349609375,\r
-    "y": 1753.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4276.900161743164,\r
+    "y": 1835.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9d5c402b.afbc18",\r
+    "id": "acfb9237.1cd6c8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4197.83349609375,\r
-    "y": 1667.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4280.900161743164,\r
+    "y": 1749.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "eb823b6e.5b1b68",\r
-        "d1229eee.7607f"\r
+        "26977aa5.25dd2e",\r
+        "72fafff.27e4d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ec67f0f.b56539",\r
+    "id": "da60761c.d9f04",\r
     "type": "save",\r
     "name": "get p-interface-dst from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3122.83349609375,\r
-    "y": 1747,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3205.900161743164,\r
+    "y": 1829.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7a356795.78dec",\r
-        "c62c11ee.d3432",\r
-        "fa667208.2a7ec"\r
+        "e055a781.15033",\r
+        "33450ab2.d72e86",\r
+        "14684e53.bc0682"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ef79491a.ef1ed",\r
+    "id": "4b7ae9f1.8aec68",\r
     "type": "comment",\r
     "name": "Question?",\r
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
     "comments": "",\r
-    "x": 3083.83349609375,\r
-    "y": 1691,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3166.900161743164,\r
+    "y": 1773.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "363ba934.edbd4e",\r
+    "id": "5f587418.c46734",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3135.83349609375,\r
-    "y": 1493,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3218.900161743164,\r
+    "y": 1575.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "fab0a5fc.8009e8",\r
-        "1a41312c.3b3677"\r
+        "f9cab6f8.ebc12",\r
+        "1ca010c1.fd862f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1a41312c.3b3677",\r
+    "id": "1ca010c1.fd862f",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3358.83349609375,\r
-    "y": 1479,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3441.900161743164,\r
+    "y": 1561.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "41d39e09.02c3d8"\r
+        "c0d41dc2.2e9ce8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fab0a5fc.8009e8",\r
+    "id": "f9cab6f8.ebc12",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3360.83349609375,\r
-    "y": 1512,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3443.900161743164,\r
+    "y": 1594.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "31a06a0b.93432e"\r
+        "3ccca278.68559e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "31a06a0b.93432e",\r
+    "id": "3ccca278.68559e",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 3503.83349609375,\r
-    "y": 1509,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3586.900161743164,\r
+    "y": 1591.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "41d39e09.02c3d8",\r
+    "id": "c0d41dc2.2e9ce8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3506.83349609375,\r
-    "y": 1472,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3589.900161743164,\r
+    "y": 1554.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "12fe71d9.7bf9be",\r
-        "c47ac813.f199b8"\r
+        "c99a0449.e56c2",\r
+        "7083ce51.93a92"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "12fe71d9.7bf9be",\r
+    "id": "c99a0449.e56c2",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",\r
     "comments": "",\r
-    "x": 3700.83349609375,\r
-    "y": 1475.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3783.900161743164,\r
+    "y": 1557.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d4ae5d82.aab8b",\r
+    "id": "e98d774e.c7639",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3753.83349609375,\r
-    "y": 1834,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3836.900161743164,\r
+    "y": 1916.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7b8dd371.aa4964"\r
+        "fd084df8.e98c58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7b8dd371.aa4964",\r
+    "id": "fd084df8.e98c58",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3959.83349609375,\r
-    "y": 1834,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4042.900161743164,\r
+    "y": 1916.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e78bd2af.32742"\r
+        "6cb7488a.a222b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e78bd2af.32742",\r
+    "id": "6cb7488a.a222b",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4177.119140625,\r
-    "y": 1832.82177734375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4260.185806274414,\r
+    "y": 1915.1075286865234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "231ad36e.3e7974"\r
+        "350b3e58.c792ea"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c47ac813.f199b8",\r
+    "id": "7083ce51.93a92",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3722.83349609375,\r
-    "y": 1543.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3805.900161743164,\r
+    "y": 1625.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "14953bcb.0f686c",\r
-        "5a2f3f75.0fbf6",\r
-        "61553bc7.07748c"\r
+        "5d1bde7f.a2e988",\r
+        "568d456e.886424",\r
+        "4559cac2.72065c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "14953bcb.0f686c",\r
+    "id": "5d1bde7f.a2e988",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3918.3336181640625,\r
-    "y": 1495.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4001.4002838134766,\r
+    "y": 1577.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e9311021.d720e8"\r
+        "7231501f.55645"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5a2f3f75.0fbf6",\r
+    "id": "568d456e.886424",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3910.3336181640625,\r
-    "y": 1550.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3993.4002838134766,\r
+    "y": 1632.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4fbd5f1f.bd6168"\r
+        "1fe97a53.6160f6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "61553bc7.07748c",\r
+    "id": "4559cac2.72065c",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3915.3336181640625,\r
-    "y": 1607.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3998.4002838134766,\r
+    "y": 1689.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ccee2aed.1d2c48"\r
+        "c16f7b5a.3ed008"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ccee2aed.1d2c48",\r
+    "id": "c16f7b5a.3ed008",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4067.3336181640625,\r
-    "y": 1608.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4150.400283813477,\r
+    "y": 1690.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4fbd5f1f.bd6168",\r
+    "id": "1fe97a53.6160f6",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4078.3336181640625,\r
-    "y": 1553.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4161.400283813477,\r
+    "y": 1635.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e9311021.d720e8",\r
+    "id": "7231501f.55645",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4062.7159423828125,\r
-    "y": 1492.6557922363281,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4145.782608032227,\r
+    "y": 1574.9415435791016,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "12595c91.b718eb"\r
+        "c3bee3fa.d3a9e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb823b6e.5b1b68",\r
+    "id": "26977aa5.25dd2e",\r
     "type": "set",\r
     "name": "set ltpId",\r
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",\r
     "comments": "",\r
-    "x": 4367.83349609375,\r
-    "y": 1628.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4450.900161743164,\r
+    "y": 1710.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d1229eee.7607f",\r
+    "id": "72fafff.27e4d",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
     "comments": "",\r
-    "x": 4368.83349609375,\r
-    "y": 1733.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4451.900161743164,\r
+    "y": 1815.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8d0a9501.e59f28",\r
+    "id": "3c2418c7.4572c8",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
     "comments": "",\r
-    "x": 4363.83349609375,\r
-    "y": 1682.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4446.900161743164,\r
+    "y": 1764.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "231ad36e.3e7974",\r
+    "id": "350b3e58.c792ea",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4383.95068359375,\r
-    "y": 1822.3404541015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4467.017349243164,\r
+    "y": 1904.626205444336,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "16f2e433.3291b4",\r
-        "80f33246.16c218",\r
-        "51170c35.40a6bc"\r
+        "5da8c5d3.b9f55c",\r
+        "1242abaf.e56384",\r
+        "ed6b22ec.e3cd3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "16f2e433.3291b4",\r
+    "id": "5da8c5d3.b9f55c",\r
     "type": "set",\r
     "name": "set destination ttp-id",\r
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 4598.95068359375,\r
-    "y": 1784.3404541015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4682.017349243164,\r
+    "y": 1866.626205444336,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "80f33246.16c218",\r
+    "id": "1242abaf.e56384",\r
     "type": "get-resource",\r
     "name": "get-resource src TTP",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4595.95068359375,\r
-    "y": 1823.3404541015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4679.017349243164,\r
+    "y": 1905.626205444336,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ec1220f2.c0002"\r
+        "44aa2b45.5157d4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "51170c35.40a6bc",\r
+    "id": "ed6b22ec.e3cd3",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4551.45068359375,\r
-    "y": 1865.3404541015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4634.517349243164,\r
+    "y": 1947.626205444336,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ec1220f2.c0002",\r
+    "id": "44aa2b45.5157d4",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4776.45068359375,\r
-    "y": 1822.3404541015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4859.517349243164,\r
+    "y": 1904.626205444336,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "757e93f0.7ee45c"\r
+        "cd8ad202.8d323"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "757e93f0.7ee45c",\r
+    "id": "cd8ad202.8d323",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4934.45068359375,\r
-    "y": 1822.3404541015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5017.517349243164,\r
+    "y": 1904.626205444336,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c7244ae.af2a238"\r
+        "3d8ba8c1.7feef8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c7244ae.af2a238",\r
+    "id": "3d8ba8c1.7feef8",\r
     "type": "set",\r
     "name": "set destination tunnel tp ip",\r
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",\r
     "comments": "",\r
-    "x": 5141.45068359375,\r
-    "y": 1822.3404541015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5224.517349243164,\r
+    "y": 1904.626205444336,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7e549eab.8dbb18",\r
+    "id": "64248373.c0f1e4",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4644.83349609375,\r
-    "y": 1511.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4727.900161743164,\r
+    "y": 1593.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1d3b129c.b2a675"\r
+        "ebf5d941.b9751"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1d3b129c.b2a675",\r
+    "id": "ebf5d941.b9751",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4821.83349609375,\r
-    "y": 1503.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4904.900161743164,\r
+    "y": 1585.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b6b58a8c.8e7ea8",\r
-        "dc3d97ac.463e28"\r
+        "5f21b6d8.97a7a8",\r
+        "a66d8cdf.7774c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "12595c91.b718eb",\r
+    "id": "c3bee3fa.d3a9e",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4246.83349609375,\r
-    "y": 1507.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4329.900161743164,\r
+    "y": 1589.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a772c4a4.38145"\r
+        "768c4246.3384b4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a772c4a4.38145",\r
+    "id": "768c4246.3384b4",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4441.83349609375,\r
-    "y": 1507.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4524.900161743164,\r
+    "y": 1589.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7e549eab.8dbb18",\r
-        "aea7a178.f6fc4"\r
+        "64248373.c0f1e4",\r
+        "d4d1382b.4bf1a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dc3d97ac.463e28",\r
+    "id": "a66d8cdf.7774c",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5029.83349609375,\r
-    "y": 1510.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5112.900161743164,\r
+    "y": 1592.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3bf3e082.eea5e8",\r
-        "58cb7d25.d2da94",\r
-        "d2f7fa01.93a528"\r
+        "798943c1.0b7f24",\r
+        "dbd1300d.b2d4d8",\r
+        "c22228e5.5f04a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a307fd53.34615",\r
+    "id": "4ab59831.7b5d28",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4823.83349609375,\r
-    "y": 1576.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4906.900161743164,\r
+    "y": 1658.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ca73ba2d.29c1c8"\r
+        "b63665cd.e9bca8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "aea7a178.f6fc4",\r
+    "id": "d4d1382b.4bf1a8",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4646.83349609375,\r
-    "y": 1584.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4729.900161743164,\r
+    "y": 1666.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a307fd53.34615"\r
+        "4ab59831.7b5d28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b6b58a8c.8e7ea8",\r
+    "id": "5f21b6d8.97a7a8",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainB id",\r
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5059.83349609375,\r
-    "y": 1458.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5142.900161743164,\r
+    "y": 1540.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ca73ba2d.29c1c8",\r
+    "id": "b63665cd.e9bca8",\r
     "type": "set",\r
     "name": "set domainB ethernet layer network-id",\r
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5005.83349609375,\r
-    "y": 1640.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5088.900161743164,\r
+    "y": 1722.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3bf3e082.eea5e8",\r
+    "id": "798943c1.0b7f24",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5239.83349609375,\r
-    "y": 1501.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5322.900161743164,\r
+    "y": 1583.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "36f4f947.29aeae"\r
+        "4408e043.c54b2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "58cb7d25.d2da94",\r
+    "id": "dbd1300d.b2d4d8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5231.83349609375,\r
-    "y": 1556.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5314.900161743164,\r
+    "y": 1638.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b7803a75.d7ec1"\r
+        "90ad08da.8c4d18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d2f7fa01.93a528",\r
+    "id": "c22228e5.5f04a",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5236.83349609375,\r
-    "y": 1613.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5319.900161743164,\r
+    "y": 1695.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8d6cbae8.86128"\r
+        "de4c591d.7f2f48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8d6cbae8.86128",\r
+    "id": "de4c591d.7f2f48",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5388.83349609375,\r
-    "y": 1614.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5471.900161743164,\r
+    "y": 1696.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b7803a75.d7ec1",\r
+    "id": "90ad08da.8c4d18",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5399.83349609375,\r
-    "y": 1559.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5482.900161743164,\r
+    "y": 1641.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "36f4f947.29aeae",\r
+    "id": "4408e043.c54b2",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5384.2158203125,\r
-    "y": 1498.6557922363281,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5467.282485961914,\r
+    "y": 1580.9415435791016,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b6324aba.def4e"\r
+        "2133344e.893bec"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b6324aba.def4e",\r
+    "id": "2133344e.893bec",\r
     "type": "set",\r
     "name": "set controller domainB data",\r
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
     "comments": "",\r
-    "x": 5598.83349609375,\r
-    "y": 1495.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5681.900161743164,\r
+    "y": 1577.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "631e76e1.71afc",\r
+    "id": "fd9bd7ab.c92bd8",\r
     "type": "set",\r
     "name": "set LEAF stuff",\r
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3187.5,\r
-    "y": 1317,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3270.566665649414,\r
+    "y": 1399.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d1d7f338.2c48e",\r
+    "id": "6a9b0f1.984457",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4464.49951171875,\r
-    "y": 457,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4547.566177368164,\r
+    "y": 539.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "df68ae5a.c6abe",\r
+    "id": "2f61d3b4.f418bc",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4532.499267578125,\r
-    "y": 659,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4615.565933227539,\r
+    "y": 741.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b17f4ff2.75d93",\r
+    "id": "b37c5dee.6ca208",\r
     "type": "set",\r
     "name": "set ROOT stuff",\r
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3083.5,\r
-    "y": 1878,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3166.566665649414,\r
+    "y": 1960.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8048035e.723ef",\r
+    "id": "1bc9df09.d67e59",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3345.5,\r
-    "y": 2791,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3428.566665649414,\r
+    "y": 2873.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d590aba5.94aa48",\r
+    "id": "6e895a21.1d4594",\r
     "type": "switchNode",\r
     "name": "switch found-middle-man?",\r
     "xml": "<switch test='`$found-middle-man`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3222.5,\r
-    "y": 2901,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3305.566665649414,\r
+    "y": 2983.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "507ab41.362cbcc",\r
-        "63f9a6e5.2f9178"\r
+        "cef17f20.edf7e8",\r
+        "6dda4254.968224"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "507ab41.362cbcc",\r
+    "id": "cef17f20.edf7e8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3406.5,\r
-    "y": 2880,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3489.566665649414,\r
+    "y": 2962.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "28f5fd24.d628ea"\r
+        "d8fe6f8d.d7595"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "63f9a6e5.2f9178",\r
+    "id": "6dda4254.968224",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2942.5,\r
-    "y": 4466,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3025.566665649414,\r
+    "y": 4548.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "db2110db.2b1778"\r
+        "d77e7161.5348c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9f11b3.a8080e5",\r
+    "id": "300daee4.3b0352",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3453.5,\r
-    "y": 5051,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3536.566665649414,\r
+    "y": 5133.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "40ac4d15.a539ec",\r
-        "577ac65e.4cd8e8",\r
-        "c33c721b.c24a68",\r
-        "e8ff43f0.c9213",\r
-        "c23415ae.23176",\r
-        "b27458da.77b73"\r
+        "318b9beb.21378c",\r
+        "1992e083.76e587",\r
+        "aaed5b46.7e8eb",\r
+        "c7aee100.ec3998",\r
+        "b969bbc7.e53528",\r
+        "54f08fa.71777f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "28f5fd24.d628ea",\r
+    "id": "d8fe6f8d.d7595",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6119.5,\r
-    "y": 1700,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6202.566665649414,\r
+    "y": 1782.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4783da3c.fb84a4",\r
-        "bb88421.9f996c",\r
-        "55b1d688.471dd",\r
-        "31123019.0abe4",\r
-        "1759beb1.f3c1d1",\r
-        "98f705b0.6bc73",\r
-        "b6e856a5.c69918",\r
-        "277a36b1.830aba",\r
-        "f9e2137d.7a2d78",\r
-        "3298314.8dc664e",\r
-        "cfdca91b.21bde",\r
-        "a46de057.2f2f3",\r
-        "2c505364.e529bc",\r
-        "5713069a.52e6e",\r
-        "736cdf51.8421c8",\r
-        "a19bdc2c.350be8",\r
-        "829d6c73.aa7da8",\r
-        "57d8804.ea8d28",\r
-        "39b6682a.960bc",\r
-        "858f96c1.79cbc",\r
-        "1b0442b9.4b628d",\r
-        "c1546bd.e66d418"\r
+        "1a1f2023.50c9f8",\r
+        "e814ac2.6d99cd",\r
+        "27a9213f.e489d6",\r
+        "904795f3.631878",\r
+        "c284bcb.2b7c44",\r
+        "1d8604a2.381ee3",\r
+        "5946c797.be74d",\r
+        "a66844b6.e099c",\r
+        "37c7ecba.efaa4c",\r
+        "72cc1cfb.a77694",\r
+        "1e88893b.a079df",\r
+        "f9c59fe9.ee503",\r
+        "4573e73f.58afa8",\r
+        "c53261d3.0987a8",\r
+        "f109d109.e8eb",\r
+        "4c9e5bd3.54a49c",\r
+        "e1cb1e55.b0357",\r
+        "e177a7a3.e48c7",\r
+        "6fa889cc.c9cce",\r
+        "c91e3a5e.c6511",\r
+        "162cf27b.802c36",\r
+        "5a5c80f6.6318b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f9e2137d.7a2d78",\r
+    "id": "37c7ecba.efaa4c",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainB",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6490.5,\r
-    "y": 1623,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6573.566665649414,\r
+    "y": 1705.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4783da3c.fb84a4",\r
+    "id": "1a1f2023.50c9f8",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6444.5,\r
-    "y": 1721,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6527.566665649414,\r
+    "y": 1803.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bb88421.9f996c",\r
+    "id": "e814ac2.6d99cd",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6580.5,\r
-    "y": 1768,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6663.566665649414,\r
+    "y": 1850.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a3afcd58.883878",\r
+    "id": "2ad7ea9.f129796",\r
     "type": "comment",\r
     "name": "Create ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6411.5,\r
-    "y": 1572,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6494.566665649414,\r
+    "y": 1654.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "47893e3d.7abf68",\r
+    "id": "942a9804.0c79c",\r
     "type": "comment",\r
     "name": "create middle man connectivity and ...",\r
     "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",\r
     "comments": "",\r
-    "x": 6907.5,\r
-    "y": 2308,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6990.566665649414,\r
+    "y": 2390.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "55b1d688.471dd",\r
+    "id": "27a9213f.e489d6",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity middle-man",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6471.5,\r
-    "y": 2347,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6554.566665649414,\r
+    "y": 2429.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "31123019.0abe4",\r
+    "id": "904795f3.631878",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6419.5,\r
-    "y": 2398,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6502.566665649414,\r
+    "y": 2480.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1759beb1.f3c1d1",\r
+    "id": "c284bcb.2b7c44",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6555.5,\r
-    "y": 2445,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6638.566665649414,\r
+    "y": 2527.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "71216be9.ff79f4",\r
+    "id": "887b2dbb.8eb65",\r
     "type": "comment",\r
     "name": "Create MIDDLE-MAN connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6412.5,\r
-    "y": 2307,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6495.566665649414,\r
+    "y": 2389.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3446875.4213df8",\r
+    "id": "8252fd61.bfc208",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6842.5,\r
-    "y": 2504,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6925.566665649414,\r
+    "y": 2586.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "98f705b0.6bc73",\r
+    "id": "1d8604a2.381ee3",\r
     "type": "save",\r
     "name": "get middle-man connectivity from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6433.5,\r
-    "y": 2551,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6516.566665649414,\r
+    "y": 2633.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4cd47e4a.423aa8",\r
-        "dbf8ee5e.1c40a8",\r
-        "e7f2720f.fd9208"\r
+        "68a11957.d1e54",\r
+        "98ce32f4.8ab98",\r
+        "ceda9f28.da773"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4cd47e4a.423aa8",\r
+    "id": "68a11957.d1e54",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6680.5,\r
-    "y": 2505,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6763.566665649414,\r
+    "y": 2587.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3446875.4213df8"\r
+        "8252fd61.bfc208"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dbf8ee5e.1c40a8",\r
+    "id": "98ce32f4.8ab98",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6680.990966796875,\r
-    "y": 2550.5740356445312,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6764.057632446289,\r
+    "y": 2632.8597869873047,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "5c2d61a6.b888d8"\r
+        "9afbaf66.fb0d68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e7f2720f.fd9208",\r
+    "id": "ceda9f28.da773",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6678.5,\r
-    "y": 2594,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6761.566665649414,\r
+    "y": 2676.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7deb6a39.1c780c"\r
+        "3e284ec9.e9b522"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5c2d61a6.b888d8",\r
+    "id": "9afbaf66.fb0d68",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 6843.5623779296875,\r
-    "y": 2550.8597717285156,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6926.629043579102,\r
+    "y": 2633.145523071289,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7deb6a39.1c780c",\r
+    "id": "3e284ec9.e9b522",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 6847.5,\r
-    "y": 2595,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6930.566665649414,\r
+    "y": 2677.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "736cdf51.8421c8",\r
+    "id": "f109d109.e8eb",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6487.5,\r
-    "y": 2867,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6570.566665649414,\r
+    "y": 2949.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a19bdc2c.350be8",\r
+    "id": "4c9e5bd3.54a49c",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6490.5,\r
-    "y": 2912,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6573.566665649414,\r
+    "y": 2994.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "57d8804.ea8d28",\r
+    "id": "e177a7a3.e48c7",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6482.5,\r
-    "y": 2666,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6565.566665649414,\r
+    "y": 2748.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "39b6682a.960bc",\r
+    "id": "6fa889cc.c9cce",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6484.5,\r
-    "y": 2713,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6567.566665649414,\r
+    "y": 2795.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "35de923d.3dc786",\r
+    "id": "5dea74d5.1b4aa4",\r
     "type": "comment",\r
     "name": "The following two will be done in F1",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6403.5,\r
-    "y": 2820,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6486.566665649414,\r
+    "y": 2902.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "64b6242c.0fc1a4",\r
+    "id": "3dd8554.be5c5aa",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4403.500244140625,\r
-    "y": 5213,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4486.566909790039,\r
+    "y": 5295.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "40ac4d15.a539ec",\r
+    "id": "318b9beb.21378c",\r
     "type": "switchNode",\r
     "name": "switch no-pce-call",\r
     "xml": "<switch test='`$no-pce-call`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3668.5,\r
-    "y": 5032,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3751.566665649414,\r
+    "y": 5114.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "243fddd4.c99fc2",\r
-        "ed2a1041.39364"\r
+        "37cde52f.e57ab2",\r
+        "655366f1.7fdc7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ed2a1041.39364",\r
+    "id": "655366f1.7fdc7",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3840.5,\r
-    "y": 5029,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3923.566665649414,\r
+    "y": 5111.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f749d2c9.24f0b"\r
+        "828433f7.b11a2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "243fddd4.c99fc2",\r
+    "id": "37cde52f.e57ab2",\r
     "type": "outcomeFalse",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3792.5,\r
-    "y": 5876,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3875.566665649414,\r
+    "y": 5958.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a2f25d49.46cd88"\r
+        "e6235853.96452"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "54d55fbb.9ecd9",\r
+    "id": "4ddc3818.58ee88",\r
     "type": "comment",\r
     "name": "1 --> PCE is needed",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3853.5,\r
-    "y": 4999,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3936.566665649414,\r
+    "y": 5081.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2bf8aac8.9b318e",\r
+    "id": "bc0b6e25.72063",\r
     "type": "comment",\r
     "name": "2 --> no need to call PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3863.5,\r
-    "y": 5834,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3946.566665649414,\r
+    "y": 5916.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b6e856a5.c69918",\r
+    "id": "5946c797.be74d",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6489.5,\r
-    "y": 3046,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6572.566665649414,\r
+    "y": 3128.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f749d2c9.24f0b",\r
+    "id": "828433f7.b11a2",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4016.5,\r
-    "y": 5031,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4099.566665649414,\r
+    "y": 5113.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b146a69c.13b518",\r
-        "436ccdfb.1e8f5c",\r
-        "124f51e3.777566",\r
-        "91ebdf82.9979e",\r
-        "3da01b2d.c332ec",\r
-        "59b34ffd.7f824",\r
-        "64b6242c.0fc1a4",\r
-        "cb7342b9.a9c168",\r
-        "7a7c44d8.30aa44"\r
+        "ec3ed36f.33f8e",\r
+        "2da9765.20a818a",\r
+        "583fc579.afbe3c",\r
+        "92f3ada6.6626b",\r
+        "d0f2c5e0.41cd1",\r
+        "80308a85.281f5",\r
+        "3dd8554.be5c5aa",\r
+        "b727caf7.37ccd",\r
+        "9d76b5ce.608a08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f96e508.5132a3",\r
+    "id": "730f8b58.f71bb4",\r
     "type": "comment",\r
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5460.499755859375,\r
-    "y": 4956,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5543.566421508789,\r
+    "y": 5038.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b146a69c.13b518",\r
+    "id": "ec3ed36f.33f8e",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4262.500244140625,\r
-    "y": 5712,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4345.566909790039,\r
+    "y": 5794.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "277a36b1.830aba",\r
+    "id": "a66844b6.e099c",\r
     "type": "save",\r
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6496.5,\r
-    "y": 1962,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6579.566665649414,\r
+    "y": 2044.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "467249d9.2faa78",\r
+    "id": "723517cc.862aa8",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",\r
     "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",\r
     "comments": "",\r
-    "x": 6546.5,\r
-    "y": 1665,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6629.566665649414,\r
+    "y": 1747.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3298314.8dc664e",\r
+    "id": "72cc1cfb.a77694",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainA",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6493.5,\r
-    "y": 1253,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6576.566665649414,\r
+    "y": 1335.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "cfdca91b.21bde",\r
+    "id": "1e88893b.a079df",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6441.5,\r
-    "y": 1301,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6524.566665649414,\r
+    "y": 1383.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a46de057.2f2f3",\r
+    "id": "f9c59fe9.ee503",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6569.5,\r
-    "y": 1348,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6652.566665649414,\r
+    "y": 1430.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f85b4c38.36c218",\r
+    "id": "5271815d.5f082",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6406.5,\r
-    "y": 1211,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6489.566665649414,\r
+    "y": 1293.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2c505364.e529bc",\r
+    "id": "4573e73f.58afa8",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "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`' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6403.5,\r
-    "y": 1439,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6486.566665649414,\r
+    "y": 1521.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5713069a.52e6e",\r
+    "id": "c53261d3.0987a8",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6496.5,\r
-    "y": 1492,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6579.566665649414,\r
+    "y": 1574.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9a759e0c.1860c8",\r
+    "id": "61b6e37e.ff4414",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6387.5,\r
-    "y": 1395,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6470.566665649414,\r
+    "y": 1477.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "147d7127.d8042f",\r
+    "id": "b4d51e76.274848",\r
     "type": "comment",\r
     "name": "Create ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6393.5,\r
-    "y": 1845,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6476.566665649414,\r
+    "y": 1927.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "91ebdf82.9979e",\r
+    "id": "92f3ada6.6626b",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4329.499755859375,\r
-    "y": 4964,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4412.566421508789,\r
+    "y": 5046.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "148c6264.137e86",\r
+    "id": "cb8799d5.d6fa78",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4313.499755859375,\r
-    "y": 4920,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4396.566421508789,\r
+    "y": 5002.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c1a606a9.56c798",\r
+    "id": "baf89c3.a308c6",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5060.499755859375,\r
-    "y": 4951,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5143.566421508789,\r
+    "y": 5033.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fd2b62b6.10b14",\r
+    "id": "6ac119cc.845568",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainA",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5147.499755859375,\r
-    "y": 4993,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5230.566421508789,\r
+    "y": 5075.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f21eb35f.395438",\r
+    "id": "be6577a4.990a1",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5095.499755859375,\r
-    "y": 5041,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5178.566421508789,\r
+    "y": 5123.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "59f69d26.ab3de4",\r
+    "id": "ed1c0a9d.7a148",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5223.499755859375,\r
-    "y": 5088,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5306.566421508789,\r
+    "y": 5170.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "59b34ffd.7f824",\r
+    "id": "80308a85.281f5",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4391.500244140625,\r
-    "y": 5255,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4474.566909790039,\r
+    "y": 5337.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9d4ad6d0.458de8",\r
+    "id": "43c35fa0.488f88",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4374.500244140625,\r
-    "y": 5317,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4457.566909790039,\r
+    "y": 5399.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "436ccdfb.1e8f5c",\r
+    "id": "2da9765.20a818a",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4485.500244140625,\r
-    "y": 5359,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4568.566909790039,\r
+    "y": 5441.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3e23ff77.47e2b",\r
+    "id": "f1717ef6.023738",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 4942.499755859375,\r
-    "y": 5530,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5025.566421508789,\r
+    "y": 5612.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ff11fb03.980398",\r
+    "id": "99843e38.83dd4",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4252.499755859375,\r
-    "y": 6228,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4335.566421508789,\r
+    "y": 6310.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4e6fe55.c2f201c",\r
+    "id": "3c45c16a.44e536",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4185.499755859375,\r
-    "y": 6182,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4268.566421508789,\r
+    "y": 6264.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "79eda8bd.206ac",\r
+    "id": "ff6ff2f.c8fff1",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4134.499755859375,\r
-    "y": 6133,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4217.566421508789,\r
+    "y": 6215.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2a4071b4.a3adee",\r
+    "id": "1431401.84d5c4",\r
     "type": "save",\r
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4917.5,\r
-    "y": 6339,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5000.566665649414,\r
+    "y": 6421.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "124f51e3.777566",\r
+    "id": "583fc579.afbe3c",\r
     "type": "switchNode",\r
     "name": "switch found-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4312.500244140625,\r
-    "y": 5416,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4395.566909790039,\r
+    "y": 5498.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ce39c047.e7ad38",\r
-        "bd96b648.334cf8"\r
+        "57091b18.0fc4d4",\r
+        "6835f627.925db8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ce39c047.e7ad38",\r
+    "id": "57091b18.0fc4d4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4523.500244140625,\r
-    "y": 5416,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4606.566909790039,\r
+    "y": 5498.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "acd66ccf.e95b3"\r
+        "328e270e.4a59d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "acd66ccf.e95b3",\r
+    "id": "328e270e.4a59d8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4679.500244140625,\r
-    "y": 5412,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4762.566909790039,\r
+    "y": 5494.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3e23ff77.47e2b",\r
-        "1f30d01.395cc3",\r
-        "58a0b8d5.3916c8"\r
+        "f1717ef6.023738",\r
+        "d4dec9b1.cf9de8",\r
+        "6712b992.157"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bd96b648.334cf8",\r
+    "id": "6835f627.925db8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4519.500244140625,\r
-    "y": 5464,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4602.566909790039,\r
+    "y": 5546.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2c5c5163.2ee716"\r
+        "bc00cffe.21aeb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c5c5163.2ee716",\r
+    "id": "bc00cffe.21aeb8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
     "comments": "",\r
-    "x": 4667.500244140625,\r
-    "y": 5459,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4750.566909790039,\r
+    "y": 5541.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8af1d85e.882ed",\r
+    "id": "684d6198.d250c8",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5184.499755859375,\r
-    "y": 5159,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5267.566421508789,\r
+    "y": 5241.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "cf6d7172.69b4b8",\r
+    "id": "ab78fc6f.8a0998",\r
     "type": "execute",\r
     "name": "execute UUID generator for ethernet-service-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2351.5,\r
-    "y": 118,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2434.566665649414,\r
+    "y": 200.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "326038f4.f291a",\r
+    "id": "1e0dcc9a.c7d15b",\r
     "type": "set",\r
     "name": "set new ethernet-service-name",\r
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 2285.5,\r
-    "y": 154,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2368.566665649414,\r
+    "y": 236.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2bce3640.48de4a",\r
+    "id": "7f3a574e.dafd48",\r
     "type": "comment",\r
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",\r
     "info": "",\r
     "comments": "",\r
-    "x": 2470.5,\r
-    "y": 81,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2553.566665649414,\r
+    "y": 163.28575134277344,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7170f2f2.71fadc",\r
+    "id": "131a46fd.415b69",\r
     "type": "set",\r
     "name": "set current-provider-id and current-cvlan-id",\r
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",\r
     "comments": "",\r
-    "x": 4219.499755859375,\r
-    "y": 6294,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4302.566421508789,\r
+    "y": 6376.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2402858c.2e7c4a",\r
+    "id": "bd42462a.156a88",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4352.499755859375,\r
-    "y": 6342,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4435.566421508789,\r
+    "y": 6424.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2fcf2035.98d3c",\r
+    "id": "28f03df7.2bcada",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4171.499755859375,\r
-    "y": 6400,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4254.566421508789,\r
+    "y": 6482.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c3761e40.b25338",\r
-        "ce543bbd.a7b0f8"\r
+        "81c1148f.4cc3d8",\r
+        "1bb40996.4838a6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c3761e40.b25338",\r
+    "id": "81c1148f.4cc3d8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4364.499755859375,\r
-    "y": 6401,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4447.566421508789,\r
+    "y": 6483.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "70442e7d.0be548"\r
+        "5632e5bc.008fd4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "70442e7d.0be548",\r
+    "id": "5632e5bc.008fd4",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",\r
     "comments": "",\r
-    "x": 4520.499755859375,\r
-    "y": 6398,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4603.566421508789,\r
+    "y": 6480.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ce543bbd.a7b0f8",\r
+    "id": "1bb40996.4838a6",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4368.499755859375,\r
-    "y": 6445,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4451.566421508789,\r
+    "y": 6527.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "47cf8ce2.24939c"\r
+        "2400d348.1454e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "47cf8ce2.24939c",\r
+    "id": "2400d348.1454e4",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4507.499755859375,\r
-    "y": 6440,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4590.566421508789,\r
+    "y": 6522.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2a4071b4.a3adee",\r
-        "ca3ef968.6dda08",\r
-        "9655804c.a8367",\r
-        "94748373.e9e958",\r
-        "a0da2cb6.f8de08",\r
-        "5744849a.cc54ac",\r
-        "4e084c4a.411b3c",\r
-        "9bb50a9.812c6f8",\r
-        "5a3abbf9.5bd584",\r
-        "860af8d0.fc96e8",\r
-        "f942597e.1aa18",\r
-        "fc4aa587.17d69",\r
-        "afa717d0.25e7a8"\r
+        "1431401.84d5c4",\r
+        "cfbbd347.67bf98",\r
+        "4f0e8fb5.8e798",\r
+        "e1e51f2c.3838b",\r
+        "38f3723d.fc373e",\r
+        "556b17f.21493e8",\r
+        "72f64404.57e414",\r
+        "4c65c6ba.14ece",\r
+        "72bff017.143e6",\r
+        "debab96e.421598",\r
+        "e11abdc.71e19c",\r
+        "6a0cb0e4.5bec78",\r
+        "811fcd41.48413"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4e084c4a.411b3c",\r
+    "id": "72f64404.57e414",\r
     "type": "save",\r
     "name": "get all-vpn-bindings from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4704.499755859375,\r
-    "y": 7119,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4787.566421508789,\r
+    "y": 7201.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b531f7cf.459858",\r
-        "14585404.95eb44",\r
-        "91bd86e2.073e5"\r
+        "f17dbf11.a99f78",\r
+        "840879a8.da7ac",\r
+        "ff33cdc7.aad138"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b531f7cf.459858",\r
+    "id": "f17dbf11.a99f78",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4899.499969482422,\r
-    "y": 7094.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4982.566635131836,\r
+    "y": 7177.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7a861e6f.3259d"\r
+        "9d7f152f.0d13"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "14585404.95eb44",\r
+    "id": "840879a8.da7ac",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4891.990936279297,\r
-    "y": 7131.574005126953,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4975.057601928711,\r
+    "y": 7213.859756469727,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7b4d1550.4d39b4"\r
+        "722c6254.b53dd4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "91bd86e2.073e5",\r
+    "id": "ff33cdc7.aad138",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4889.499969482422,\r
-    "y": 7174.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4972.566635131836,\r
+    "y": 7257.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c9793222.0d19b8"\r
+        "2dfdab6e.e9f304"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7a861e6f.3259d",\r
+    "id": "9d7f152f.0d13",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5071.499969482422,\r
-    "y": 7092.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5154.566635131836,\r
+    "y": 7175.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "96392b44.e759e"\r
+        "f4de49b1.9e78c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7b4d1550.4d39b4",\r
+    "id": "722c6254.b53dd4",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5054.562347412109,\r
-    "y": 7131.8597412109375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5137.629013061523,\r
+    "y": 7214.145492553711,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c9793222.0d19b8",\r
+    "id": "2dfdab6e.e9f304",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 5056.499969482422,\r
-    "y": 7173.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5139.566635131836,\r
+    "y": 7256.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "96392b44.e759e",\r
+    "id": "f4de49b1.9e78c8",\r
     "type": "for",\r
     "name": "for vpnidx in all-vpn-bindings",\r
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5312.499755859375,\r
-    "y": 7127,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5395.566421508789,\r
+    "y": 7209.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "dcbe395c.2f719"\r
+        "c3d85a4.1f615a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dcbe395c.2f719",\r
+    "id": "c3d85a4.1f615a8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5549.499755859375,\r
-    "y": 7123,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5632.566421508789,\r
+    "y": 7205.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d5739a70.ba04c"\r
+        "f610bb15.d46c3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6bd2c51b.a65de4",\r
+    "id": "3165802b.467878",\r
     "type": "switchNode",\r
     "name": "switch vpnuuid is for this slice",\r
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5816.499755859375,\r
-    "y": 7089,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5899.566421508789,\r
+    "y": 7171.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c0446363.1c2dd",\r
-        "c5d80881.fdd1f"\r
+        "fa2a5991.1b9ca",\r
+        "bf56d405.cdd208"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c0446363.1c2dd",\r
+    "id": "fa2a5991.1b9ca",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5997.499755859375,\r
-    "y": 7115,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6080.566421508789,\r
+    "y": 7197.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d5739a70.ba04c"\r
+        "f610bb15.d46c3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c5d80881.fdd1f",\r
+    "id": "bf56d405.cdd208",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5996.499755859375,\r
-    "y": 7068,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6079.566421508789,\r
+    "y": 7150.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d5739a70.ba04c",\r
+    "id": "f610bb15.d46c3",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4513.499969482422,\r
-    "y": 7262.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4596.566635131836,\r
+    "y": 7345.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "edcf20b8.e61748"\r
+        "c29275cf.22abd8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4fecf72f.04fbc",\r
+    "id": "424309da.5dae7",\r
     "type": "set",\r
     "name": "set tmp.aai.the-vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
     "comments": "",\r
-    "x": 5589.499755859375,\r
-    "y": 7295,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5672.566421508789,\r
+    "y": 7377.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c1969b50.1f4a7",\r
+    "id": "37faaddd.0a2fe2",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4802.499969482422,\r
-    "y": 7030.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4885.566635131836,\r
+    "y": 7113.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5744849a.cc54ac",\r
+    "id": "556b17f.21493e8",\r
     "type": "set",\r
     "name": "set srcTtp OTN layer",\r
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4686.499755859375,\r
-    "y": 6915,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4769.566421508789,\r
+    "y": 6997.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3d6f4e35.1dbdf2",\r
+    "id": "bbd937d0.174fa8",\r
     "type": "switchNode",\r
     "name": "switch provider-id domainA",\r
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5031.499755859375,\r
-    "y": 6746,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5114.566421508789,\r
+    "y": 6828.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1b824e77.058e42"\r
+        "74d7f148.c83f28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1b824e77.058e42",\r
+    "id": "74d7f148.c83f28",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5251.499755859375,\r
-    "y": 6752,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5334.566421508789,\r
+    "y": 6834.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2ab4f0b.650811"\r
+        "e33037d6.9207c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2ab4f0b.650811",\r
+    "id": "e33037d6.9207c",\r
     "type": "switchNode",\r
     "name": "switch te-topo-id",\r
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5436.499755859375,\r
-    "y": 6751,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5519.566421508789,\r
+    "y": 6833.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a23d4d14.87325"\r
+        "ff68f8c5.ac398"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a23d4d14.87325",\r
+    "id": "ff68f8c5.ac398",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5628.499755859375,\r
-    "y": 6754,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5711.566421508789,\r
+    "y": 6836.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2907eab4.583386"\r
+        "3023756a.3df6f2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2907eab4.583386",\r
+    "id": "3023756a.3df6f2",\r
     "type": "set",\r
     "name": "set otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
     "comments": "",\r
-    "x": 5837.499755859375,\r
-    "y": 6752,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5920.566421508789,\r
+    "y": 6834.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9bb50a9.812c6f8",\r
+    "id": "4c65c6ba.14ece",\r
     "type": "for",\r
     "name": "for netwidx..allNetworksList_length",\r
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4738.499755859375,\r
-    "y": 6740,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4821.566421508789,\r
+    "y": 6822.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3d6f4e35.1dbdf2"\r
+        "bbd937d0.174fa8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9655804c.a8367",\r
+    "id": "4f0e8fb5.8e798",\r
     "type": "get-resource",\r
     "name": "get-resource network-resources-list",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4746.499755859375,\r
-    "y": 6633,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4829.566421508789,\r
+    "y": 6715.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e3853ecb.86ffa8",\r
-        "e9c51b36.8628d",\r
-        "65b57cea.285c3c"\r
+        "689e25a7.4ec344",\r
+        "fb96069a.99a898",\r
+        "67a95680.dd059"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e3853ecb.86ffa8",\r
+    "id": "689e25a7.4ec344",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4982.499755859375,\r
-    "y": 6616,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5065.566421508789,\r
+    "y": 6698.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e9c51b36.8628d",\r
+    "id": "fb96069a.99a898",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4979.499755859375,\r
-    "y": 6657,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5062.566421508789,\r
+    "y": 6739.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "65b57cea.285c3c",\r
+    "id": "67a95680.dd059",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4993.499755859375,\r
-    "y": 6697,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5076.566421508789,\r
+    "y": 6779.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "94748373.e9e958",\r
+    "id": "e1e51f2c.3838b",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
     "comments": "",\r
-    "x": 4682.499755859375,\r
-    "y": 6792,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4765.566421508789,\r
+    "y": 6874.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a0da2cb6.f8de08",\r
+    "id": "38f3723d.fc373e",\r
     "type": "set",\r
     "name": "set tmp.pce-src-node",\r
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",\r
     "comments": "",\r
-    "x": 4690.499755859375,\r
-    "y": 6850,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4773.566421508789,\r
+    "y": 6932.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ca3ef968.6dda08",\r
+    "id": "cfbbd347.67bf98",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
     "comments": "",\r
-    "x": 4695.499755859375,\r
-    "y": 6590,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4778.566421508789,\r
+    "y": 6672.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "85cec0fe.92a4b",\r
+    "id": "b798d2b8.423e4",\r
     "type": "comment",\r
     "name": "The following section is to find srcTtp OTN layer (its long name)",\r
     "info": "The following section is to find srcTtp OTN layer (its long name)",\r
     "comments": "",\r
-    "x": 4810.499755859375,\r
-    "y": 6542,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4893.566421508789,\r
+    "y": 6624.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "edcf20b8.e61748",\r
+    "id": "c29275cf.22abd8",\r
     "type": "switchNode",\r
     "name": "switch ops-note is srcTtpOtnLayer",\r
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4803.499969482422,\r
-    "y": 7257.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4886.566635131836,\r
+    "y": 7340.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e8e7019e.0ce4e8",\r
-        "cf2cb292.2ab218"\r
+        "48d3293f.1d09c8",\r
+        "2e7c42e6.c2eade"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e8e7019e.0ce4e8",\r
+    "id": "48d3293f.1d09c8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5059.499969482422,\r
-    "y": 7229.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5142.566635131836,\r
+    "y": 7312.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2fafeba7.6be734"\r
+        "fc947668.8a9d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cf2cb292.2ab218",\r
+    "id": "2e7c42e6.c2eade",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5059.499969482422,\r
-    "y": 7278.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5142.566635131836,\r
+    "y": 7361.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "997dfd42.35e9c",\r
+    "id": "86241828.71762",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5325.499969482422,\r
-    "y": 7270.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5408.566635131836,\r
+    "y": 7353.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "fd323ea3.0ba61",\r
-        "4fecf72f.04fbc",\r
-        "8645a39d.96b86"\r
+        "78fc3e29.1eba58",\r
+        "424309da.5dae7",\r
+        "7b230c0f.716d14"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "81edaff5.fe8de8",\r
+    "id": "ec22280e.4e15f",\r
     "type": "comment",\r
     "name": "increase the bw of the-vpn-binding and change status to modified",\r
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 5717.499755859375,\r
-    "y": 7349,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5800.566421508789,\r
+    "y": 7431.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8645a39d.96b86",\r
+    "id": "7b230c0f.716d14",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5687.499755859375,\r
-    "y": 7409,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5770.566421508789,\r
+    "y": 7491.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fd323ea3.0ba61",\r
+    "id": "78fc3e29.1eba58",\r
     "type": "set",\r
     "name": "unset tmp.aai.the-vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",\r
     "comments": "",\r
-    "x": 5594.499755859375,\r
-    "y": 7237,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5677.566421508789,\r
+    "y": 7319.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a2f25d49.46cd88",\r
+    "id": "e6235853.96452",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3944.5,\r
-    "y": 5875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4027.566665649414,\r
+    "y": 5957.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4e6fe55.c2f201c",\r
-        "7170f2f2.71fadc",\r
-        "2402858c.2e7c4a",\r
-        "2fcf2035.98d3c",\r
-        "ff11fb03.980398"\r
+        "3c45c16a.44e536",\r
+        "131a46fd.415b69",\r
+        "bd42462a.156a88",\r
+        "28f03df7.2bcada",\r
+        "99843e38.83dd4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d7183096.a014a",\r
+    "id": "825ad15b.e200f",\r
     "type": "set",\r
     "name": "unset otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
     "comments": "",\r
-    "x": 4687.499755859375,\r
-    "y": 6690,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4770.566421508789,\r
+    "y": 6772.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5a3abbf9.5bd584",\r
+    "id": "72bff017.143e6",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4810.5,\r
-    "y": 6420,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4893.566665649414,\r
+    "y": 6502.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "48e1585a.35691",\r
+    "id": "218269db.41502e",\r
     "type": "comment",\r
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "comments": "",\r
-    "x": 4947.5,\r
-    "y": 6370,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5030.566665649414,\r
+    "y": 6452.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "829d6c73.aa7da8",\r
+    "id": "e1cb1e55.b0357",\r
     "type": "save",\r
     "name": "save ROOT UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6409.5,\r
-    "y": 1904,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6492.566665649414,\r
+    "y": 1986.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "261b01ae.fe9b36",\r
+    "id": "d01f4492.e07e28",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3675.5,\r
-    "y": 1298,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3758.566665649414,\r
+    "y": 1380.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f92c744c.f5b4a8",\r
+    "id": "27d91ce4.eff5e4",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3813.5,\r
-    "y": 1786,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3896.566665649414,\r
+    "y": 1868.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a9675d4a.27492",\r
+    "id": "bcdaf6d5.61613",\r
     "type": "comment",\r
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6370.5,\r
-    "y": 2616,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6453.566665649414,\r
+    "y": 2698.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "577ac65e.4cd8e8",\r
+    "id": "1992e083.76e587",\r
     "type": "set",\r
     "name": "set current-provider-id and current-cvlan-id",\r
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",\r
     "comments": "",\r
-    "x": 3662.5,\r
-    "y": 4892,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3745.566665649414,\r
+    "y": 4974.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c33c721b.c24a68",\r
+    "id": "aaed5b46.7e8eb",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3795.5,\r
-    "y": 4940,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3878.566665649414,\r
+    "y": 5022.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3da01b2d.c332ec",\r
+    "id": "d0f2c5e0.41cd1",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4340.499755859375,\r
-    "y": 5020,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4423.566421508789,\r
+    "y": 5102.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "67f3fde2.d1c4bc",\r
-        "830cc023.8d75b8"\r
+        "c51b9855.45ff88",\r
+        "4079da5.fe1c9a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "67f3fde2.d1c4bc",\r
+    "id": "c51b9855.45ff88",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4533.499755859375,\r
-    "y": 5021,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4616.566421508789,\r
+    "y": 5103.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "97ecf17d.e53ae8"\r
+        "69766fb9.fbb74"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "830cc023.8d75b8",\r
+    "id": "4079da5.fe1c9a4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4537.499755859375,\r
-    "y": 5065,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4620.566421508789,\r
+    "y": 5147.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e6486dc.92da59"\r
+        "1a522b67.5bcd1d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e6486dc.92da59",\r
+    "id": "1a522b67.5bcd1d",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4676.499755859375,\r
-    "y": 5060,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4759.566421508789,\r
+    "y": 5142.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f9d2f7c1.e8a63",\r
-        "2f9c4db0.869cca",\r
-        "cfcbce5e.a3353"\r
+        "e1cf34bb.9518e",\r
+        "6d11acf9.928044",\r
+        "613e9b77.298d54"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "97ecf17d.e53ae8",\r
+    "id": "69766fb9.fbb74",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4676.499755859375,\r
-    "y": 5017,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4759.566421508789,\r
+    "y": 5099.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "fd2b62b6.10b14",\r
-        "f21eb35f.395438",\r
-        "59f69d26.ab3de4",\r
-        "8af1d85e.882ed"\r
+        "6ac119cc.845568",\r
+        "be6577a4.990a1",\r
+        "ed1c0a9d.7a148",\r
+        "684d6198.d250c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f9d2f7c1.e8a63",\r
+    "id": "e1cf34bb.9518e",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainA-uuid",\r
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 5070.499755859375,\r
-    "y": 5311,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5153.566421508789,\r
+    "y": 5393.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a14dbd8f.fd09c8",\r
+    "id": "63360813.209ad8",\r
     "type": "comment",\r
     "name": "populate connectivity-A variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5077.499755859375,\r
-    "y": 5265,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5160.566421508789,\r
+    "y": 5347.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "860af8d0.fc96e8",\r
+    "id": "debab96e.421598",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4867.499969482422,\r
-    "y": 6979.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4950.566635131836,\r
+    "y": 7062.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2f9c4db0.869cca",\r
+    "id": "6d11acf9.928044",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5189.499755859375,\r
-    "y": 5364,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5272.566421508789,\r
+    "y": 5446.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1f30d01.395cc3",\r
+    "id": "d4dec9b1.cf9de8",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5071.499755859375,\r
-    "y": 5582,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5154.566421508789,\r
+    "y": 5664.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f7b3410e.fff05",\r
+    "id": "dbce4650.6b5848",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3617.5,\r
-    "y": 4341,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3700.566665649414,\r
+    "y": 4423.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7607e020.fe77f",\r
+    "id": "edcfccb6.0b10e8",\r
     "type": "save",\r
     "name": "update ROOT UNI in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3951.5,\r
-    "y": 4524,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4034.566665649414,\r
+    "y": 4606.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e8ff43f0.c9213",\r
+    "id": "c7aee100.ec3998",\r
     "type": "save",\r
     "name": "get root uni from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3563.5,\r
-    "y": 4391,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3646.566665649414,\r
+    "y": 4473.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3f20a2e3.9197ce",\r
-        "836b51a4.29ff7",\r
-        "a19206dd.24a2b8"\r
+        "1339ee7e.d32932",\r
+        "f08ce63a.aff18",\r
+        "a999ee96.e09558"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "836b51a4.29ff7",\r
+    "id": "f08ce63a.aff18",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3790.990966796875,\r
-    "y": 4363.573974609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3874.057632446289,\r
+    "y": 4445.859725952148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "cc477903.35a1a8"\r
+        "1c6fd05d.948d88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a19206dd.24a2b8",\r
+    "id": "a999ee96.e09558",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3786.5,\r
-    "y": 4407.999938964844,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3869.566665649414,\r
+    "y": 4490.285690307617,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9ac9aba4.1e8ac"\r
+        "1f86883b.9ad4a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cc477903.35a1a8",\r
+    "id": "1c6fd05d.948d88",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3953.5625,\r
-    "y": 4362.859680175781,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4036.629165649414,\r
+    "y": 4445.145431518555,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9ac9aba4.1e8ac",\r
+    "id": "1f86883b.9ad4a8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3954.5,\r
-    "y": 4407.999938964844,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4037.566665649414,\r
+    "y": 4490.285690307617,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "44a45bc4.fd8d24",\r
+    "id": "1213361d.be12aa",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3739.5,\r
-    "y": 4481,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3822.566665649414,\r
+    "y": 4563.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8f06a9d6.e85d2",\r
-        "7607e020.fe77f"\r
+        "fbd53f4.dd8234",\r
+        "edcfccb6.0b10e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3f20a2e3.9197ce",\r
+    "id": "1339ee7e.d32932",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3570.5,\r
-    "y": 4481,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3653.566665649414,\r
+    "y": 4563.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "44a45bc4.fd8d24"\r
+        "1213361d.be12aa"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8f06a9d6.e85d2",\r
+    "id": "fbd53f4.dd8234",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 3928.5,\r
-    "y": 4473,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4011.566665649414,\r
+    "y": 4555.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c23415ae.23176",\r
+    "id": "b969bbc7.e53528",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3770.5,\r
-    "y": 4768,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3853.566665649414,\r
+    "y": 4850.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "cb253b17.73576",\r
+    "id": "a6ad0dd0.a6fcc8",\r
     "type": "comment",\r
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3553.5,\r
-    "y": 2851,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3636.566665649414,\r
+    "y": 2933.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9d7a29e5.a75ec",\r
+    "id": "d73dbef9.62ae5",\r
     "type": "comment",\r
     "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",\r
     "info": "",\r
     "comments": "",\r
-    "x": 2758.5,\r
-    "y": 4413,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2841.566665649414,\r
+    "y": 4495.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8b862d24.0bbe68",\r
+    "id": "38b3d969.be8c96",\r
     "type": "exists",\r
     "name": "exists LEAF UNI",\r
     "xml": "<exists plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3181.5,\r
-    "y": 4686,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3264.566665649414,\r
+    "y": 4768.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b605d8db.884f2",\r
-        "fdd54f31.8fbee"\r
+        "4afa5be1.7f901c",\r
+        "3036b28a.042a4e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "db2110db.2b1778",\r
+    "id": "d77e7161.5348c8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3013.5,\r
-    "y": 4689,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3096.566665649414,\r
+    "y": 4771.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8b862d24.0bbe68"\r
+        "38b3d969.be8c96"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fdd54f31.8fbee",\r
+    "id": "3036b28a.042a4e",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3344.5,\r
-    "y": 4705,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3427.566665649414,\r
+    "y": 4787.285751342773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9f11b3.a8080e5"\r
+        "300daee4.3b0352"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b605d8db.884f2",\r
+    "id": "4afa5be1.7f901c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3380.5,\r
-    "y": 3312,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3463.566665649414,\r
+    "y": 3394.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "947600ba.b5e73"\r
+        "afe0131e.843c9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4f6ce4fa.367e24",\r
+    "id": "40724b83.4d51bc",\r
     "type": "switchNode",\r
     "name": "switch leafuni.data-source == gfp",\r
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3729.5,\r
-    "y": 3154,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3812.566665649414,\r
+    "y": 3236.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "cc96bd45.2e2b6",\r
-        "f9a0faf9.5c3dc8"\r
+        "822b2d43.9a91a",\r
+        "33ca94.ea4af56c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cc96bd45.2e2b6",\r
+    "id": "822b2d43.9a91a",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3934.5,\r
-    "y": 3150,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4017.566665649414,\r
+    "y": 3232.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f9a0faf9.5c3dc8",\r
+    "id": "33ca94.ea4af56c",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3936.5,\r
-    "y": 3200,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4019.566665649414,\r
+    "y": 3282.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7a40f51a.96d7fc"\r
+        "1d0af02e.93b4f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7a40f51a.96d7fc",\r
+    "id": "1d0af02e.93b4f",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4092.5,\r
-    "y": 3206,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4175.566665649414,\r
+    "y": 3288.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2c2d832.1ec14fc",\r
-        "16e3f1c0.bf6bbe",\r
-        "3515662b.208b2a",\r
-        "271e520.e6acbae"\r
+        "523d0093.735cb",\r
+        "21f4d27b.d11a96",\r
+        "1c5f100e.a5d978",\r
+        "2d4de683.3992d2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c2d832.1ec14fc",\r
+    "id": "523d0093.735cb",\r
     "type": "set",\r
     "name": "set bwModified",\r
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4318.500244140625,\r
-    "y": 2947,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4401.566909790039,\r
+    "y": 3029.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f6d89aab.47f778",\r
+    "id": "fce8efa1.5f12e",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4817.499725341797,\r
-    "y": 4243.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4900.566390991211,\r
+    "y": 4326.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f49c2dcf.bc27d8",\r
-        "cc8917f6.431d58"\r
+        "e3611e5a.49f6f",\r
+        "7474f571.02042c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cc8917f6.431d58",\r
+    "id": "7474f571.02042c",\r
     "type": "set",\r
     "name": "unset tmp.aai.vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
     "comments": "",\r
-    "x": 5019.499481201172,\r
-    "y": 4210.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5102.566146850586,\r
+    "y": 4293.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a80257aa.4070f",\r
+    "id": "c554c9c8.b91c38",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 4703.499969482422,\r
-    "y": 4420.999725341797,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4786.566635131836,\r
+    "y": 4503.28547668457,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d0212ac6.85c08",\r
+    "id": "9c21225.8549a6",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4700.562103271484,\r
-    "y": 4369.8597412109375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4783.628768920898,\r
+    "y": 4452.145492553711,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "efad35a4.dd1e7",\r
+    "id": "6669e686.3a92d",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4283.499725341797,\r
-    "y": 4243.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4366.566390991211,\r
+    "y": 4326.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "bbd4adaa.78aa88"\r
+        "6cdd29ff.2176f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bbd4adaa.78aa88",\r
+    "id": "6cdd29ff.2176f",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4488.499725341797,\r
-    "y": 4243.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4571.566390991211,\r
+    "y": 4326.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7d1062e5.6c959c"\r
+        "462e489b.1c9ea8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7d1062e5.6c959c",\r
+    "id": "462e489b.1c9ea8",\r
     "type": "outcome",\r
     "name": "vpn-binding",\r
     "xml": "<outcome value='vpn-binding'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4654.499725341797,\r
-    "y": 4243.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4737.566390991211,\r
+    "y": 4326.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f6d89aab.47f778"\r
+        "fce8efa1.5f12e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f49c2dcf.bc27d8",\r
+    "id": "e3611e5a.49f6f",\r
     "type": "save",\r
     "name": "get vpn-binding from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4326.499725341797,\r
-    "y": 4321.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4409.566390991211,\r
+    "y": 4404.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2b073b5b.643194",\r
-        "ffd59a4c.14fa7",\r
-        "2abdbd7a.263a72"\r
+        "5af860a5.71ed3",\r
+        "234eb12a.7530fe",\r
+        "358a6c9c.71984c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2b073b5b.643194",\r
+    "id": "5af860a5.71ed3",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4537.499725341797,\r
-    "y": 4323.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4620.566390991211,\r
+    "y": 4406.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b25769d8.6df3c8"\r
+        "e32197a7.4c81d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ffd59a4c.14fa7",\r
+    "id": "234eb12a.7530fe",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4537.990692138672,\r
-    "y": 4369.574005126953,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4621.057357788086,\r
+    "y": 4451.859756469727,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d0212ac6.85c08"\r
+        "9c21225.8549a6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2abdbd7a.263a72",\r
+    "id": "358a6c9c.71984c",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4535.499725341797,\r
-    "y": 4412.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4618.566390991211,\r
+    "y": 4495.285720825195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a80257aa.4070f"\r
+        "c554c9c8.b91c38"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "947600ba.b5e73",\r
+    "id": "afe0131e.843c9",\r
     "type": "save",\r
     "name": "get LEAF uni from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3603.5,\r
-    "y": 2997,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3686.566665649414,\r
+    "y": 3079.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6a786745.af48",\r
-        "a633d7c2.0708",\r
-        "f368276f.48f958"\r
+        "9dbeb0e5.86c59",\r
+        "ca19c457.91ce7",\r
+        "a8db99d3.ea1d58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a633d7c2.0708",\r
+    "id": "ca19c457.91ce7",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3830.990966796875,\r
-    "y": 2969.573974609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3914.057632446289,\r
+    "y": 3051.8597259521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "30a6f1cd.e89f6e"\r
+        "940a0baf.b50538"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f368276f.48f958",\r
+    "id": "a8db99d3.ea1d58",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3826.5,\r
-    "y": 3013.9999389648438,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3909.566665649414,\r
+    "y": 3096.285690307617,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "868e3def.777d88"\r
+        "199d9fc8.23d478"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "30a6f1cd.e89f6e",\r
+    "id": "940a0baf.b50538",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3993.5625,\r
-    "y": 2968.8596801757812,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4076.629165649414,\r
+    "y": 3051.1454315185547,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "868e3def.777d88",\r
+    "id": "199d9fc8.23d478",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3994.5,\r
-    "y": 3013.9999389648438,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4077.566665649414,\r
+    "y": 3096.285690307617,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6a786745.af48",\r
+    "id": "9dbeb0e5.86c59",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3838.5,\r
-    "y": 3064,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3921.566665649414,\r
+    "y": 3146.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4f6ce4fa.367e24"\r
+        "40724b83.4d51bc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e1ab631b.742fc",\r
+    "id": "667c445f.dc3e5c",\r
     "type": "comment",\r
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3728.383331298828,\r
-    "y": 3254.883331298828,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3811.449996948242,\r
+    "y": 3337.1690826416016,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9ac35f29.2f46a8",\r
+    "id": "7651a38e.4e7e44",\r
     "type": "set",\r
     "name": "set current-provider-id and current-cvlan-id",\r
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",\r
     "comments": "",\r
-    "x": 3710.10009765625,\r
-    "y": 3816.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3793.166763305664,\r
+    "y": 3898.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3dda5d6b.eae642",\r
+    "id": "e0666b60.cb174",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3848.10009765625,\r
-    "y": 3874.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3931.166763305664,\r
+    "y": 3956.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "16e3f1c0.bf6bbe",\r
+    "id": "21f4d27b.d11a96",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3426.10009765625,\r
-    "y": 3556.083251953125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3509.166763305664,\r
+    "y": 3638.3690032958984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "616a588c.b788e8",\r
-        "23b69bc.0871b64",\r
-        "92806e4e.351398"\r
+        "407839fb.167e2",\r
+        "931a7a68.51c848",\r
+        "f4ea682a.e63f08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "14abd55c.d773d3",\r
+    "id": "91a690e7.1a5918",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3667.10009765625,\r
-    "y": 3984.4833984375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3750.166763305664,\r
+    "y": 4066.7691497802734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "5c65738b.87fde4",\r
-        "f1d641f8.d259a8"\r
+        "34fa09a4.b2b1ae",\r
+        "809131d.392dfd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5c65738b.87fde4",\r
+    "id": "34fa09a4.b2b1ae",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3860.10009765625,\r
-    "y": 3985.4833984375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3943.166763305664,\r
+    "y": 4067.7691497802734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "65a9280d.a9da1"\r
+        "b77388f8.551df8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f1d641f8.d259a8",\r
+    "id": "809131d.392dfd",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3864.10009765625,\r
-    "y": 4029.4833984375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3947.166763305664,\r
+    "y": 4111.769149780273,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "5b392e39.74c58"\r
+        "2e72f134.3b345e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5b392e39.74c58",\r
+    "id": "2e72f134.3b345e",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4003.10009765625,\r
-    "y": 4024.4833984375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4086.166763305664,\r
+    "y": 4106.769149780273,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "efad35a4.dd1e7"\r
+        "6669e686.3a92d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "65a9280d.a9da1",\r
+    "id": "b77388f8.551df8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",\r
     "comments": "",\r
-    "x": 4004.10009765625,\r
-    "y": 3981.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4087.166763305664,\r
+    "y": 4063.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3515662b.208b2a",\r
+    "id": "1c5f100e.a5d978",\r
     "type": "switchNode",\r
     "name": "switch leafuni.data-source > gfp",\r
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4352.217041015625,\r
-    "y": 3203.283447265625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4435.283706665039,\r
+    "y": 3285.5691986083984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d3894fc3.10eb48",\r
-        "b517f9eb.6c257"\r
+        "f17d25a9.fc3a28",\r
+        "d1a832ec.f421b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d3894fc3.10eb48",\r
+    "id": "f17d25a9.fc3a28",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4551.384033203125,\r
-    "y": 3269.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4634.450698852539,\r
+    "y": 3352.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d481f8d7.46db"\r
+        "3ef002bf.b5c35e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b517f9eb.6c257",\r
+    "id": "d1a832ec.f421b",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4573.384033203125,\r
-    "y": 3114.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4656.450698852539,\r
+    "y": 3197.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "543771c5.3e82b"\r
+        "d05f5529.96a4b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "271e520.e6acbae",\r
+    "id": "2d4de683.3992d2",\r
     "type": "save",\r
     "name": "update LEAF UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4351.217041015625,\r
-    "y": 3058.4833984375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4434.283706665039,\r
+    "y": 3140.7691497802734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5841cd16.599de4",\r
+    "id": "e42871e4.7e7078",\r
     "type": "comment",\r
     "name": "update LEAF UNI with the new bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4367.384033203125,\r
-    "y": 3011.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4450.450698852539,\r
+    "y": 3094.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c6724a1e.a746a",\r
+    "id": "dcbc2987.d3bdd",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4922.14990234375,\r
-    "y": 2466.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5005.216567993164,\r
+    "y": 2549.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f5319096.b377c8",\r
+    "id": "feb1ef44.b73648",\r
     "type": "save",\r
     "name": "update ROOT UNI in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5524.14990234375,\r
-    "y": 2571.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5607.216567993164,\r
+    "y": 2654.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1d10f282.65ef3d",\r
+    "id": "56698383.1dde24",\r
     "type": "save",\r
     "name": "get root uni from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4914.149658203125,\r
-    "y": 2512.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4997.216323852539,\r
+    "y": 2595.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e6ffa5af.877ac",\r
-        "53ba0501.50937c",\r
-        "f8ebf6c0.ef2f7"\r
+        "b538dd4e.00fce",\r
+        "3917ea5e.68d896",\r
+        "234d36ee.00b9a2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "53ba0501.50937c",\r
+    "id": "3917ea5e.68d896",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5141.640625,\r
-    "y": 2485.457275390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5224.707290649414,\r
+    "y": 2567.7430267333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "25bf7485.4207ec"\r
+        "bb66fc72.62525"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f8ebf6c0.ef2f7",\r
+    "id": "234d36ee.00b9a2",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5137.149658203125,\r
-    "y": 2529.8832397460938,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5220.216323852539,\r
+    "y": 2612.168991088867,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8cc56294.07b6a"\r
+        "2eceea5f.8355a6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "25bf7485.4207ec",\r
+    "id": "bb66fc72.62525",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5304.212158203125,\r
-    "y": 2484.7429809570312,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5387.278823852539,\r
+    "y": 2567.0287322998047,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8cc56294.07b6a",\r
+    "id": "2eceea5f.8355a6",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 5305.149658203125,\r
-    "y": 2529.8832397460938,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5388.216323852539,\r
+    "y": 2612.168991088867,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "29839d19.ca2152",\r
+    "id": "b5d59b15.1b765",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5302.149658203125,\r
-    "y": 2579.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5385.216323852539,\r
+    "y": 2662.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4a49d064.4801a8",\r
-        "f5319096.b377c8"\r
+        "85d5ae48.70e33",\r
+        "feb1ef44.b73648"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e6ffa5af.877ac",\r
+    "id": "b538dd4e.00fce",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5133.149658203125,\r
-    "y": 2579.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5216.216323852539,\r
+    "y": 2662.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "29839d19.ca2152"\r
+        "b5d59b15.1b765"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4a49d064.4801a8",\r
+    "id": "85d5ae48.70e33",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",\r
     "comments": "",\r
-    "x": 5484.150390625,\r
-    "y": 2521.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5567.217056274414,\r
+    "y": 2604.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fc1d58de.266bc8",\r
+    "id": "3c4fd972.8c727e",\r
     "type": "comment",\r
     "name": "bw+ has increased ",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4565.383331298828,\r
-    "y": 3076.883331298828,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4648.449996948242,\r
+    "y": 3159.1690826416016,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "81aa1dbe.56ac78",\r
+    "id": "9a2b9c1d.56f0c",\r
     "type": "comment",\r
     "name": "bw- has decreased",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4564.217041015625,\r
-    "y": 3233.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4647.283706665039,\r
+    "y": 3315.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "175559ed.ae176e",\r
+    "id": "22475743.9e3838",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5013.21630859375,\r
-    "y": 2806.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5096.282974243164,\r
+    "y": 2888.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b4d05ea3.ef437",\r
+    "id": "791cfc48.d2aabc",\r
     "type": "save",\r
     "name": "update ROOT UNI in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5615.21630859375,\r
-    "y": 2911.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5698.282974243164,\r
+    "y": 2993.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "909ddf1c.4247f",\r
+    "id": "b94b085c.7cb5a8",\r
     "type": "save",\r
     "name": "get root uni from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5005.216064453125,\r
-    "y": 2852.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5088.282730102539,\r
+    "y": 2934.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6ec56bfe.bf9374",\r
-        "ac80268f.768e5",\r
-        "a8e739ac.bd4b"\r
+        "d976d76c.67e958",\r
+        "8e60ee6f.c2d2f",\r
+        "835f78f2.c41258"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ac80268f.768e5",\r
+    "id": "8e60ee6f.c2d2f",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5232.70703125,\r
-    "y": 2825.25732421875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5315.773696899414,\r
+    "y": 2907.5430755615234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c8c7d986.838778"\r
+        "bf2ec467.02c0d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a8e739ac.bd4b",\r
+    "id": "835f78f2.c41258",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5228.216064453125,\r
-    "y": 2869.6832885742188,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5311.282730102539,\r
+    "y": 2951.969039916992,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3dcb1fdf.a3fec"\r
+        "c322ac12.a985c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c8c7d986.838778",\r
+    "id": "bf2ec467.02c0d8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5395.278564453125,\r
-    "y": 2824.5430297851562,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5478.345230102539,\r
+    "y": 2906.8287811279297,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3dcb1fdf.a3fec",\r
+    "id": "c322ac12.a985c8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 5396.216064453125,\r
-    "y": 2869.6832885742188,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5479.282730102539,\r
+    "y": 2951.969039916992,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9b0bdc3d.6e83d8",\r
+    "id": "380b5701.029218",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5393.216064453125,\r
-    "y": 2919.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5476.282730102539,\r
+    "y": 3001.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e12fb18d.e25528",\r
-        "b4d05ea3.ef437"\r
+        "2037a317.5823d4",\r
+        "791cfc48.d2aabc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6ec56bfe.bf9374",\r
+    "id": "d976d76c.67e958",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5224.216064453125,\r
-    "y": 2919.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5307.282730102539,\r
+    "y": 3001.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9b0bdc3d.6e83d8"\r
+        "380b5701.029218"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e12fb18d.e25528",\r
+    "id": "2037a317.5823d4",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",\r
     "comments": "",\r
-    "x": 5575.216796875,\r
-    "y": 2861.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5658.283462524414,\r
+    "y": 2943.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "77cc19f0.65a298",\r
+    "id": "d383ac36.342cc",\r
     "type": "set",\r
     "name": "set delta",\r
     "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",\r
     "comments": "",\r
-    "x": 4930.216064453125,\r
-    "y": 2765.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5013.282730102539,\r
+    "y": 2847.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d481f8d7.46db",\r
+    "id": "3ef002bf.b5c35e",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4723.383331298828,\r
-    "y": 3258.883331298828,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4806.449996948242,\r
+    "y": 3341.1690826416016,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "77cc19f0.65a298",\r
-        "909ddf1c.4247f",\r
-        "d39256ff.c99e4"\r
+        "d383ac36.342cc",\r
+        "b94b085c.7cb5a8",\r
+        "37f3e792.01b98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "543771c5.3e82b",\r
+    "id": "d05f5529.96a4b8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4744.11669921875,\r
-    "y": 3085.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4827.183364868164,\r
+    "y": 3167.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9e50adf.3f804d",\r
-        "1d10f282.65ef3d",\r
-        "3c12d321.f6ab2c"\r
+        "30b48cfc.8858f4",\r
+        "56698383.1dde24",\r
+        "9f73e0e4.5bd9a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9e50adf.3f804d",\r
+    "id": "30b48cfc.8858f4",\r
     "type": "set",\r
     "name": "set delta",\r
     "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",\r
     "comments": "",\r
-    "x": 4878.949462890625,\r
-    "y": 2391.4833984375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4962.016128540039,\r
+    "y": 2473.7691497802734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d7fa5270.13e728",\r
+    "id": "eb34d49c.d22a8",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4338.2666015625,\r
-    "y": 3158.683349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4421.333267211914,\r
+    "y": 3240.9691009521484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fea06caf.d7087",\r
+    "id": "2675acce.b9a12c",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3807.600067138672,\r
-    "y": 4147.483856201172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3890.666732788086,\r
+    "y": 4229.769607543945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5c1ea12c.02fb18",\r
+    "id": "b63f121.ce4247",\r
     "type": "switchNode",\r
     "name": "switch found-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3642.600067138672,\r
-    "y": 4219.683807373047,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3725.666732788086,\r
+    "y": 4301.96955871582,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b82e9023.76f9f8",\r
-        "f2f0e3e2.cfb0a8"\r
+        "8b9ac42e.1e08f",\r
+        "109545ec.57786a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b82e9023.76f9f8",\r
+    "id": "8b9ac42e.1e08f",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3853.600067138672,\r
-    "y": 4219.683807373047,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3936.666732788086,\r
+    "y": 4301.96955871582,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4d4a5650.900498"\r
+        "8bee6e1e.eff33"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f2f0e3e2.cfb0a8",\r
+    "id": "109545ec.57786a",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3849.600067138672,\r
-    "y": 4267.683807373047,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3932.666732788086,\r
+    "y": 4349.96955871582,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "87662134.188498"\r
+        "a4995391.fc5358"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4d4a5650.900498",\r
+    "id": "8bee6e1e.eff33",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4009.600067138672,\r
-    "y": 4215.683807373047,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4092.666732788086,\r
+    "y": 4297.96955871582,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "cdbc2fd5.f72b4"\r
+        "b36b53d7.2d66a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "87662134.188498",\r
+    "id": "a4995391.fc5358",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found but it should have been!' />\n",\r
     "comments": "",\r
-    "x": 3997.600067138672,\r
-    "y": 4262.683807373047,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4080.666732788086,\r
+    "y": 4344.96955871582,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2111dda1.fcbdb2",\r
+    "id": "294f0835.1325e",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4850.566162109375,\r
-    "y": 4529.882568359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4933.632827758789,\r
+    "y": 4612.168319702148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4fae975f.53fc68",\r
-        "c1f934d5.cc0aa8"\r
+        "66149bc9.393fc4",\r
+        "ca1fbeb5.c9d45"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c1f934d5.cc0aa8",\r
+    "id": "ca1fbeb5.c9d45",\r
     "type": "set",\r
     "name": "unset tmp.aai.vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
     "comments": "",\r
-    "x": 5093.56640625,\r
-    "y": 4498.882568359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5176.633071899414,\r
+    "y": 4581.168319702148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cf80b7cc.7e2e9",\r
+    "id": "fb61c0ac.1edc98",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4710.566162109375,\r
-    "y": 4639.882568359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4793.632827758789,\r
+    "y": 4722.168319702148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "94dec63b.8ae1e"\r
+        "3b9c82f6.e6f406"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "840bbd02.3035a",\r
+    "id": "ca5b121a.c4f29",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 4698.56640625,\r
-    "y": 4732.8828125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4781.633071899414,\r
+    "y": 4815.168563842773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cdbcda75.ac4888",\r
+    "id": "27d3cdcb.a5be82",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4700.6285400390625,\r
-    "y": 4687.742340087891,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4783.695205688477,\r
+    "y": 4770.028091430664,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cdbc2fd5.f72b4",\r
+    "id": "b36b53d7.2d66a8",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4316.566162109375,\r
-    "y": 4529.882568359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4399.632827758789,\r
+    "y": 4612.168319702148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "bc868ed9.895db8"\r
+        "a0726a73.552d38"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bc868ed9.895db8",\r
+    "id": "a0726a73.552d38",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4521.566162109375,\r
-    "y": 4529.882568359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4604.632827758789,\r
+    "y": 4612.168319702148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7ae6a8de.c87848"\r
+        "c054f471.25372"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7ae6a8de.c87848",\r
+    "id": "c054f471.25372",\r
     "type": "outcome",\r
     "name": "vpn-binding",\r
     "xml": "<outcome value='vpn-binding'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4687.566162109375,\r
-    "y": 4529.882568359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4770.632827758789,\r
+    "y": 4612.168319702148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2111dda1.fcbdb2"\r
+        "294f0835.1325e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4fae975f.53fc68",\r
+    "id": "66149bc9.393fc4",\r
     "type": "save",\r
     "name": "get vpn-binding from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4326.566162109375,\r
-    "y": 4639.882568359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4409.632827758789,\r
+    "y": 4722.168319702148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c295dc4d.214d28",\r
-        "c45fd018.eeb138",\r
-        "e9db7616.b3ebb8"\r
+        "6e23d592.fd6b7c",\r
+        "ebdcd4d0.c0565",\r
+        "cbc774c8.750668"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c295dc4d.214d28",\r
+    "id": "6e23d592.fd6b7c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4537.566162109375,\r
-    "y": 4641.882568359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4620.632827758789,\r
+    "y": 4724.168319702148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "cf80b7cc.7e2e9"\r
+        "fb61c0ac.1edc98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c45fd018.eeb138",\r
+    "id": "ebdcd4d0.c0565",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4538.05712890625,\r
-    "y": 4687.456604003906,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4621.123794555664,\r
+    "y": 4769.74235534668,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "cdbcda75.ac4888"\r
+        "27d3cdcb.a5be82"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e9db7616.b3ebb8",\r
+    "id": "cbc774c8.750668",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4535.566162109375,\r
-    "y": 4730.882568359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4618.632827758789,\r
+    "y": 4813.168319702148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "840bbd02.3035a"\r
+        "ca5b121a.c4f29"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "297b4ae7.8b9706",\r
+    "id": "c9811fe.3333a6",\r
     "type": "comment",\r
     "name": "Temporary skipping this check - to support multiple instances in one slice",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5946.383056640625,\r
-    "y": 7029.08349609375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6029.449722290039,\r
+    "y": 7111.369247436523,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "457d3858.29d0e",\r
+    "id": "e4958a72.db4418",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5214.850067138672,\r
-    "y": 4260.283172607422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5297.916732788086,\r
+    "y": 4342.568923950195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b25769d8.6df3c8",\r
+    "id": "e32197a7.4c81d8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4716.850311279297,\r
-    "y": 4326.283172607422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4799.916976928711,\r
+    "y": 4408.568923950195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "201cbbc6.38c61c",\r
+    "id": "c808b6be.91a2f",\r
     "type": "switchNode",\r
     "name": "switch ops-note is srcTtpOtnLayer",\r
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5247.850067138672,\r
-    "y": 4328.283172607422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5330.916732788086,\r
+    "y": 4410.568923950195,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "823be1e9.77a818",\r
-        "82dbf116.45c298"\r
+        "81cfd436.09d848",\r
+        "56387492.e922bc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "823be1e9.77a818",\r
+    "id": "81cfd436.09d848",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5372.850067138672,\r
-    "y": 4226.282928466797,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5455.916732788086,\r
+    "y": 4308.56867980957,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ea4b8bb2.02c728"\r
+        "f77cd261.9bc248"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "82dbf116.45c298",\r
+    "id": "56387492.e922bc",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5491.85009765625,\r
-    "y": 4300.282958984375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5574.916763305664,\r
+    "y": 4382.568710327148,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "12318d1c.9b97cb",\r
+    "id": "ebf96cf8.b5e018",\r
     "type": "set",\r
     "name": "set srcTtp OTN layer",\r
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4460.533203125,\r
-    "y": 3872,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4543.599868774414,\r
+    "y": 3954.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1c49d26a.15504e",\r
+    "id": "305ba790.74ff78",\r
     "type": "switchNode",\r
     "name": "switch provider-id domainA",\r
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4805.533203125,\r
-    "y": 3734,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4888.599868774414,\r
+    "y": 3816.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ee8d9735.9d0e18"\r
+        "810cd856.9ccc78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "75d5369a.76387",\r
+    "id": "c7beb2fc.58c5e",\r
     "type": "for",\r
     "name": "for netwidx..allNetworksList_length",\r
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4512.533203125,\r
-    "y": 3728,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4595.599868774414,\r
+    "y": 3810.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1c49d26a.15504e"\r
+        "305ba790.74ff78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2e9ad10b.18ccd6",\r
+    "id": "42cb0058.08b348",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4767.533203125,\r
-    "y": 3685,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4850.599868774414,\r
+    "y": 3767.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8bf9488.63f0cb8",\r
+    "id": "f96c39ea.1e754",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
     "comments": "",\r
-    "x": 4456.533203125,\r
-    "y": 3780,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4539.599868774414,\r
+    "y": 3862.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4168ca78.86bd8c",\r
+    "id": "9b7536d9.f58d3",\r
     "type": "set",\r
     "name": "set tmp.pce-src-node",\r
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",\r
     "comments": "",\r
-    "x": 4464.533203125,\r
-    "y": 3825,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4547.599868774414,\r
+    "y": 3907.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6e2860cf.ccae3",\r
+    "id": "78f36f08.9d23a",\r
     "type": "set",\r
     "name": "unset otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
     "comments": "",\r
-    "x": 4461.533203125,\r
-    "y": 3678,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4544.599868774414,\r
+    "y": 3760.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ee8d9735.9d0e18",\r
+    "id": "810cd856.9ccc78",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4714.533203125,\r
-    "y": 3802,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4797.599868774414,\r
+    "y": 3884.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "16183a46.3a0a2e"\r
+        "842c0b07.9daf5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "16183a46.3a0a2e",\r
+    "id": "842c0b07.9daf5",\r
     "type": "switchNode",\r
     "name": "switch te-topo-id",\r
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4899.533203125,\r
-    "y": 3801,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4982.599868774414,\r
+    "y": 3883.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9cdceec0.5d3c1"\r
+        "effe4e96.61186"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9cdceec0.5d3c1",\r
+    "id": "effe4e96.61186",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5091.533203125,\r
-    "y": 3804,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5174.599868774414,\r
+    "y": 3886.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a8a5fc36.2f7d"\r
+        "e837bc5d.d6f4a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a8a5fc36.2f7d",\r
+    "id": "e837bc5d.d6f4a",\r
     "type": "set",\r
     "name": "set otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
     "comments": "",\r
-    "x": 5263.533203125,\r
-    "y": 3800,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5346.599868774414,\r
+    "y": 3882.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "eb8710b8.36ef48",\r
+    "id": "5ae03ba5.e05364",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4639.533203125,\r
-    "y": 3915,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4722.599868774414,\r
+    "y": 3997.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "616a588c.b788e8",\r
+    "id": "407839fb.167e2",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4156.533203125,\r
-    "y": 3700,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4239.599868774414,\r
+    "y": 3782.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "711898b1.a3a988",\r
-        "c5e1be90.cd78d",\r
-        "8bf9488.63f0cb8",\r
-        "4168ca78.86bd8c",\r
-        "12318d1c.9b97cb",\r
-        "75d5369a.76387",\r
-        "eb8710b8.36ef48"\r
+        "873e71a3.8a59a",\r
+        "2ae96c09.c29bbc",\r
+        "f96c39ea.1e754",\r
+        "9b7536d9.f58d3",\r
+        "ebf96cf8.b5e018",\r
+        "c7beb2fc.58c5e",\r
+        "5ae03ba5.e05364"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d9429d2a.b15568",\r
+    "id": "78165047.ec87e8",\r
     "type": "comment",\r
     "name": "The following section is to find srcTtp OTN layer (its long name)",\r
     "info": "The following section is to find srcTtp OTN layer (its long name)",\r
     "comments": "",\r
-    "x": 4141.533203125,\r
-    "y": 3634,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4224.599868774414,\r
+    "y": 3716.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c5e1be90.cd78d",\r
+    "id": "2ae96c09.c29bbc",\r
     "type": "get-resource",\r
     "name": "get-resource network-resources-list",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4520.533203125,\r
-    "y": 3621,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4603.599868774414,\r
+    "y": 3703.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d0e253fc.83209",\r
-        "415d3771.16041",\r
-        "2e9ad10b.18ccd6"\r
+        "d4c85a8.dd0a8a8",\r
+        "e8890a4e.1d2fd",\r
+        "42cb0058.08b348"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d0e253fc.83209",\r
+    "id": "d4c85a8.dd0a8a8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4756.533203125,\r
-    "y": 3604,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4839.599868774414,\r
+    "y": 3686.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "415d3771.16041",\r
+    "id": "e8890a4e.1d2fd",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4753.533203125,\r
-    "y": 3645,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4836.599868774414,\r
+    "y": 3727.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "711898b1.a3a988",\r
+    "id": "873e71a3.8a59a",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
     "comments": "",\r
-    "x": 4469.533203125,\r
-    "y": 3578,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4552.599868774414,\r
+    "y": 3660.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6bda79b8.645a68",\r
+    "id": "86fc32b9.5b11e8",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5198.93310546875,\r
-    "y": 4627.39990234375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5281.999771118164,\r
+    "y": 4709.685653686523,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "94dec63b.8ae1e",\r
+    "id": "3b9c82f6.e6f406",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4987.93310546875,\r
-    "y": 4689.39990234375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5070.999771118164,\r
+    "y": 4771.685653686523,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "5b09d63.4152d28"\r
+        "1361709c.aa1da7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5b09d63.4152d28",\r
+    "id": "1361709c.aa1da7",\r
     "type": "switchNode",\r
     "name": "switch ops-note is srcTtpOtnLayer",\r
     "xml": "<switch test=\"`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5231.93310546875,\r
-    "y": 4695.39990234375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5314.999771118164,\r
+    "y": 4777.685653686523,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4ce07cc6.c3d424",\r
-        "f554a368.1a08c8"\r
+        "65e42246.3bc70c",\r
+        "4c5853af.96f634"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4ce07cc6.c3d424",\r
+    "id": "65e42246.3bc70c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5462.93310546875,\r
-    "y": 4673.39990234375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5545.999771118164,\r
+    "y": 4755.685653686523,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e736f8f3.ed2808"\r
+        "86c13c.8334e6c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f554a368.1a08c8",\r
+    "id": "4c5853af.96f634",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5467.93310546875,\r
-    "y": 4740.39990234375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5550.999771118164,\r
+    "y": 4822.685653686523,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4a82e0bf.f144f",\r
+    "id": "c5f7e346.0cad5",\r
     "type": "switchNode",\r
     "name": "switch tmp.isBwIncreased",\r
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5716.816864013672,\r
-    "y": 4238.082244873047,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5799.883529663086,\r
+    "y": 4320.36799621582,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8b36e42.8d18318",\r
-        "9e33af49.9f241"\r
+        "36b3fe84.38d7ba",\r
+        "4dc5480c.f82fe8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8b36e42.8d18318",\r
+    "id": "36b3fe84.38d7ba",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5871.81689453125,\r
-    "y": 4166.08251953125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5954.883560180664,\r
+    "y": 4248.368270874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b40b55f7.23af98"\r
+        "55b477cf.ef13f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9e33af49.9f241",\r
+    "id": "4dc5480c.f82fe8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5872.81689453125,\r
-    "y": 4299.08251953125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5955.883560180664,\r
+    "y": 4381.368270874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b38dd55a.418b38"\r
+        "c669d5e6.7b56e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b40b55f7.23af98",\r
+    "id": "55b477cf.ef13f8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6016.81689453125,\r
-    "y": 4166.082763671875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6099.883560180664,\r
+    "y": 4248.368515014648,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3913dc06.a223d4",\r
-        "839acfd7.2291a"\r
+        "13bb5bff.e1f664",\r
+        "d1738758.598cd8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3913dc06.a223d4",\r
+    "id": "13bb5bff.e1f664",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6309.81689453125,\r
-    "y": 4144.08251953125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6392.883560180664,\r
+    "y": 4226.368270874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "839acfd7.2291a",\r
+    "id": "d1738758.598cd8",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6261.466796875,\r
-    "y": 4191.3994140625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6344.533462524414,\r
+    "y": 4273.685165405273,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4d10eebf.474a88",\r
+    "id": "c20dae0a.c8db1",\r
     "type": "comment",\r
     "name": "increase the bw of the-vpn-binding and change status to modified",\r
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 6334.816864013672,\r
-    "y": 4093.082244873047,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6417.883529663086,\r
+    "y": 4175.36799621582,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b38dd55a.418b38",\r
+    "id": "c669d5e6.7b56e8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6028.81689453125,\r
-    "y": 4298.082763671875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6111.883560180664,\r
+    "y": 4380.368515014648,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8675cc13.463188",\r
-        "35c1f8d2.a502"\r
+        "fbd54f6b.bd5de8",\r
+        "4b0d9778.02ef98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8675cc13.463188",\r
+    "id": "fbd54f6b.bd5de8",\r
     "type": "save",\r
     "name": "update the-vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6321.81689453125,\r
-    "y": 4276.08251953125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6404.883560180664,\r
+    "y": 4358.368270874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "35c1f8d2.a502",\r
+    "id": "4b0d9778.02ef98",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6273.466796875,\r
-    "y": 4323.3994140625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6356.533462524414,\r
+    "y": 4405.685165405273,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b5ed36f4.c5e02",\r
+    "id": "2c35c11.f28a13e",\r
     "type": "comment",\r
     "name": "decrease the bw of the-vpn-binding and change status to modified",\r
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 6345.81689453125,\r
-    "y": 4237.08251953125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6428.883560180664,\r
+    "y": 4319.368270874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e736f8f3.ed2808",\r
+    "id": "86c13c.8334e6c8",\r
     "type": "switchNode",\r
     "name": "switch tmp.isBwIncreased",\r
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5668.0498046875,\r
-    "y": 4680.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5751.116470336914,\r
+    "y": 4762.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c39fa1bf.775f28",\r
-        "760b6a69.a4fd14"\r
+        "f84ec623.3e0358",\r
+        "579a6f55.5876b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c39fa1bf.775f28",\r
+    "id": "f84ec623.3e0358",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5863.0498046875,\r
-    "y": 4608.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5946.116470336914,\r
+    "y": 4690.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "903811e2.41d4e8"\r
+        "7ac296e6.db7d4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "760b6a69.a4fd14",\r
+    "id": "579a6f55.5876b8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5864.0498046875,\r
-    "y": 4741.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5947.116470336914,\r
+    "y": 4823.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8a352d04.a7b5f"\r
+        "63acc8c1.d0489"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "903811e2.41d4e8",\r
+    "id": "7ac296e6.db7d4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6008.0498046875,\r
-    "y": 4608.283447265625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6091.116470336914,\r
+    "y": 4690.569198608398,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "dd052918.eeeec8",\r
-        "5b6d1623.4afde8"\r
+        "7470326b.50fd4c",\r
+        "6067f5da.462f2c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dd052918.eeeec8",\r
+    "id": "7470326b.50fd4c",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6301.0498046875,\r
-    "y": 4586.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6384.116470336914,\r
+    "y": 4668.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5b6d1623.4afde8",\r
+    "id": "6067f5da.462f2c",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6252.69970703125,\r
-    "y": 4633.60009765625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6335.766372680664,\r
+    "y": 4715.885848999023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f8433708.1cf278",\r
+    "id": "b621fab3.fd22d8",\r
     "type": "comment",\r
     "name": "increase the bw of the-vpn-binding and change status to modified",\r
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 6325.0498046875,\r
-    "y": 4547.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6408.116470336914,\r
+    "y": 4629.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8a352d04.a7b5f",\r
+    "id": "63acc8c1.d0489",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6020.0498046875,\r
-    "y": 4740.283447265625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6103.116470336914,\r
+    "y": 4822.569198608398,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1797ce6f.bf55da",\r
-        "f850925d.eaddb8"\r
+        "ab9c7cb.6ee1c8",\r
+        "478e555b.00c56c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1797ce6f.bf55da",\r
+    "id": "ab9c7cb.6ee1c8",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6313.0498046875,\r
-    "y": 4718.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6396.116470336914,\r
+    "y": 4800.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f850925d.eaddb8",\r
+    "id": "478e555b.00c56c",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6264.69970703125,\r
-    "y": 4765.60009765625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6347.766372680664,\r
+    "y": 4847.885848999023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "98f83ad6.f376c",\r
+    "id": "57c5a214.d70e3c",\r
     "type": "comment",\r
     "name": "decrease the bw of the-vpn-binding and change status to modified",\r
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 6337.0498046875,\r
-    "y": 4679.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6420.116470336914,\r
+    "y": 4761.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f3a92d2f.d14e78",\r
+    "id": "b34554cf.aa2d2",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5075.89990234375,\r
-    "y": 5420.4833984375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5158.966567993164,\r
+    "y": 5502.769149780273,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cfcbce5e.a3353",\r
+    "id": "613e9b77.298d54",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5073.68310546875,\r
-    "y": 5460.68359375,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5156.749771118164,\r
+    "y": 5542.969345092773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "35bf741d.0589dc",\r
+    "id": "95d677c9.726458",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4948.933349609375,\r
-    "y": 5645.16650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5032.000015258789,\r
+    "y": 5727.452255249023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "58a0b8d5.3916c8",\r
+    "id": "6712b992.157",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4946.716552734375,\r
-    "y": 5685.36669921875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5029.783218383789,\r
+    "y": 5767.652450561523,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "141a3bed.ea5a94",\r
+    "id": "abfdee17.12df08",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5046.0498046875,\r
-    "y": 5969.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5129.116470336914,\r
+    "y": 6051.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8127bfc.2c0cdc",\r
+    "id": "1b1c3355.4ab2b5",\r
     "type": "switchNode",\r
     "name": "switch found-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4873.0498046875,\r
-    "y": 6026.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4956.116470336914,\r
+    "y": 6108.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "eb3bc0b8.920088",\r
-        "e32169bb.0af1a8"\r
+        "5c00f9d2.103a1",\r
+        "4db44e39.57056"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb3bc0b8.920088",\r
+    "id": "5c00f9d2.103a1",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5084.0498046875,\r
-    "y": 6026.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5167.116470336914,\r
+    "y": 6108.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2548cb5a.7d91a4"\r
+        "e62c2a04.834ba8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e32169bb.0af1a8",\r
+    "id": "4db44e39.57056",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5080.0498046875,\r
-    "y": 6074.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5163.116470336914,\r
+    "y": 6156.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6b0e17ed.7e019"\r
+        "2dd9a1ca.3380de"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2548cb5a.7d91a4",\r
+    "id": "e62c2a04.834ba8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5240.0498046875,\r
-    "y": 6022.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5323.116470336914,\r
+    "y": 6104.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4736668b.da34e8",\r
-        "d60814f1.44b368",\r
-        "3b369b46.f16d74"\r
+        "59a4f603.629458",\r
+        "cf3067c2.3ee01",\r
+        "b81f8f7c.c8bbe"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6b0e17ed.7e019",\r
+    "id": "2dd9a1ca.3380de",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
     "comments": "",\r
-    "x": 5228.0498046875,\r
-    "y": 6069.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5311.116470336914,\r
+    "y": 6151.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b390ff23.8e635",\r
+    "id": "4526cd48.9f1514",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5505.93359375,\r
-    "y": 6122.16650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5589.000259399414,\r
+    "y": 6204.452255249023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3b369b46.f16d74",\r
+    "id": "b81f8f7c.c8bbe",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5503.716796875,\r
-    "y": 6162.36669921875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5586.783462524414,\r
+    "y": 6244.652450561523,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d60814f1.44b368",\r
+    "id": "cf3067c2.3ee01",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5623.0498046875,\r
-    "y": 6074.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5706.116470336914,\r
+    "y": 6156.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4736668b.da34e8",\r
+    "id": "59a4f603.629458",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 5494.0498046875,\r
-    "y": 6022.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5577.116470336914,\r
+    "y": 6104.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "85c984f2.33f7c8",\r
+    "id": "67b13c77.507314",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4935.0498046875,\r
-    "y": 5927.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5018.116470336914,\r
+    "y": 6009.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f942597e.1aa18",\r
+    "id": "e11abdc.71e19c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4582.3828125,\r
-    "y": 6014.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4665.449478149414,\r
+    "y": 6096.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "141a3bed.ea5a94",\r
-        "8127bfc.2c0cdc",\r
-        "8afd899a.01e88",\r
-        "8c1f115c.700108"\r
+        "abfdee17.12df08",\r
+        "1b1c3355.4ab2b5",\r
+        "b5179b.b5811868",\r
+        "8a0b9185.29b548"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fc4aa587.17d69",\r
+    "id": "6a0cb0e4.5bec78",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4926.13330078125,\r
-    "y": 6483.283203125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5009.199966430664,\r
+    "y": 6565.568954467773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "41ec9458.f731e4",\r
+    "id": "4b79bf18.1b12f8",\r
     "type": "comment",\r
     "name": "TODO: BUG -- DONE",\r
     "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.",\r
     "comments": "",\r
-    "x": 3631.500457763672,\r
-    "y": 3759.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3714.567123413086,\r
+    "y": 3842.2857208251953,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "23b69bc.0871b64",\r
+    "id": "931a7a68.51c848",\r
     "type": "save",\r
     "name": "get all-vpn-bindings from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4384.033660888672,\r
-    "y": 4034.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4467.100326538086,\r
+    "y": 4116.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "75525335.c9aa54",\r
-        "d5340ebc.32553",\r
-        "f8167756.f35bd8"\r
+        "810ab4c1.abf7e",\r
+        "4e13a1b8.dde8c",\r
+        "e5e81f70.f40458"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "977709e8.5868c",\r
+    "id": "c0e77edb.5b02c",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4492.033905029297,\r
-    "y": 3990.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4575.100570678711,\r
+    "y": 4072.4024200439453,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "75525335.c9aa54",\r
+    "id": "810ab4c1.abf7e",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4589.033660888672,\r
-    "y": 4031.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4672.100326538086,\r
+    "y": 4113.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b5414319.96d9"\r
+        "fa4e460e.6cd96"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d5340ebc.32553",\r
+    "id": "4e13a1b8.dde8c",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4572.524627685547,\r
-    "y": 4092.690704345703,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4655.591293334961,\r
+    "y": 4174.976455688477,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a327dd9c.9d096"\r
+        "4d1c0281.9a84bc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f8167756.f35bd8",\r
+    "id": "e5e81f70.f40458",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4570.033660888672,\r
-    "y": 4136.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4653.100326538086,\r
+    "y": 4218.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "784d31ab.abb97"\r
+        "5961321d.8806a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b5414319.96d9",\r
+    "id": "fa4e460e.6cd96",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4757.033905029297,\r
-    "y": 4026.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4840.100570678711,\r
+    "y": 4108.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "98142959.81fca"\r
+        "4d09e7f7.7140b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a327dd9c.9d096",\r
+    "id": "4d1c0281.9a84bc",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4735.096038818359,\r
-    "y": 4092.9764404296875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4818.162704467773,\r
+    "y": 4175.262191772461,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "784d31ab.abb97",\r
+    "id": "5961321d.8806a4",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 4737.033660888672,\r
-    "y": 4135.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4820.100326538086,\r
+    "y": 4217.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "98142959.81fca",\r
+    "id": "4d09e7f7.7140b8",\r
     "type": "for",\r
     "name": "for vpnidx in all-vpn-bindings",\r
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4995.033905029297,\r
-    "y": 4031.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5078.100570678711,\r
+    "y": 4113.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6df0b8a0.a7c62"\r
+        "45b87759.5a906"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6df0b8a0.a7c62",\r
+    "id": "45b87759.5a906",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5229.033660888672,\r
-    "y": 4038.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5312.100326538086,\r
+    "y": 4120.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "201cbbc6.38c61c"\r
+        "c808b6be.91a2f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "92806e4e.351398",\r
+    "id": "f4ea682a.e63f08",\r
     "type": "set",\r
     "name": "unset tmp.aai.all-vpn-bindings",\r
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",\r
     "comments": "",\r
-    "x": 4362.733367919922,\r
-    "y": 3960.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4445.800033569336,\r
+    "y": 4042.4024200439453,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f43de449.20024",\r
+    "id": "1d230bf5.a23cfc",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5645.883270263672,\r
-    "y": 4048.699676513672,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5728.949935913086,\r
+    "y": 4130.985427856445,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7a53ecb2.cec2c4"\r
+        "516d68ca.7c7f6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7a53ecb2.cec2c4",\r
+    "id": "516d68ca.7c7f6",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5837.883270263672,\r
-    "y": 4037.699920654297,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5920.949935913086,\r
+    "y": 4119.98567199707,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "700641c0.5a055"\r
+        "39e7022f.c30a2e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "700641c0.5a055",\r
+    "id": "39e7022f.c30a2e",\r
     "type": "outcome",\r
     "name": "connectivity",\r
     "xml": "<outcome value='connectivity'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6019.883270263672,\r
-    "y": 4016.699920654297,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6102.949935913086,\r
+    "y": 4098.98567199707,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9920129e.a09"\r
+        "455228ea.3ce16"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9920129e.a09",\r
+    "id": "455228ea.3ce16",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 6181.883270263672,\r
-    "y": 4005.699920654297,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6264.949935913086,\r
+    "y": 4087.9856719970703,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7f7dfee.7fba8",\r
-        "c8f259e.2871ba8"\r
+        "826e861c.8cb3f8",\r
+        "78a2c33b.328edc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f7dfee.7fba8",\r
+    "id": "826e861c.8cb3f8",\r
     "type": "set",\r
     "name": "unset tmp.the-connectivity",\r
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",\r
     "comments": "",\r
-    "x": 6378.883270263672,\r
-    "y": 3934.699920654297,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6461.949935913086,\r
+    "y": 4016.9856719970703,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "335b26db.86f24a",\r
+    "id": "d1bcb0d5.b833a",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5552.833465576172,\r
-    "y": 4163.699676513672,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5635.900131225586,\r
+    "y": 4245.985427856445,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "4a82e0bf.f144f",\r
-        "f43de449.20024",\r
-        "1e79d0a7.c66727",\r
-        "7f90edcc.1e82b4"\r
+        "c5f7e346.0cad5",\r
+        "1d230bf5.a23cfc",\r
+        "1966547c.c3884c",\r
+        "d31d83e1.8d9b98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1e79d0a7.c66727",\r
+    "id": "1966547c.c3884c",\r
     "type": "set",\r
     "name": "unset tmp.aai.the-vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",\r
     "comments": "",\r
-    "x": 5684.399871826172,\r
-    "y": 3938.916717529297,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5767.466537475586,\r
+    "y": 4021.2024688720703,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7f90edcc.1e82b4",\r
+    "id": "d31d83e1.8d9b98",\r
     "type": "set",\r
     "name": "set tmp.aai.the-vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
     "comments": "",\r
-    "x": 5676.399871826172,\r
-    "y": 3987.916717529297,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5759.466537475586,\r
+    "y": 4070.2024688720703,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c8f259e.2871ba8",\r
+    "id": "78a2c33b.328edc",\r
     "type": "set",\r
     "name": "set tmp.the-connectivity.connectivity-id",\r
     "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",\r
     "comments": "",\r
-    "x": 6384.350067138672,\r
-    "y": 4043.916717529297,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6467.416732788086,\r
+    "y": 4126.20246887207,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a412e157.cf47d8",\r
+    "id": "b4318014.e1a038",\r
     "type": "set",\r
     "name": "set vpnNameToSearch",\r
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
     "comments": "",\r
-    "x": 5677.616668701172,\r
-    "y": 3762.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5760.683334350586,\r
+    "y": 3844.4024200439453,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6887559d.aa01b4",\r
+    "id": "985ed7d4.ec17a",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5831.616668701172,\r
-    "y": 3814.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5914.683334350586,\r
+    "y": 3896.4024200439453,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ea4b8bb2.02c728",\r
+    "id": "f77cd261.9bc248",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5422.616668701172,\r
-    "y": 3881.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5505.683334350586,\r
+    "y": 3963.4024200439453,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6887559d.aa01b4",\r
-        "d154a2e6.a2bcc",\r
-        "a412e157.cf47d8"\r
+        "985ed7d4.ec17a",\r
+        "543e7c89.750024",\r
+        "b4318014.e1a038"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d154a2e6.a2bcc",\r
+    "id": "543e7c89.750024",\r
     "type": "switchNode",\r
     "name": "switch $foundVpnName",\r
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5676.616668701172,\r
-    "y": 3869.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5759.683334350586,\r
+    "y": 3951.4024200439453,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "89918c5f.33a478"\r
+        "8bf41864.55ad6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "89918c5f.33a478",\r
+    "id": "8bf41864.55ad6",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5855.616668701172,\r
-    "y": 3868.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5938.683334350586,\r
+    "y": 3950.4024200439453,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "335b26db.86f24a"\r
+        "d1bcb0d5.b833a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2fafeba7.6be734",\r
+    "id": "fc947668.8a9d8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4553.616668701172,\r
-    "y": 7386.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4636.683334350586,\r
+    "y": 7468.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "18db3335.23915d",\r
-        "d2fe4c45.697938",\r
-        "175608de.c2a5b7"\r
+        "9818a5dd.1c569",\r
+        "2b482f66.6e7e5",\r
+        "43c9acaa.ef761c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "175608de.c2a5b7",\r
+    "id": "43c9acaa.ef761c",\r
     "type": "set",\r
     "name": "set vpnNameToSearch",\r
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
     "comments": "",\r
-    "x": 4776.616668701172,\r
-    "y": 7330.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4859.683334350586,\r
+    "y": 7412.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "18db3335.23915d",\r
+    "id": "9818a5dd.1c569",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4955.616668701172,\r
-    "y": 7373.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5038.683334350586,\r
+    "y": 7455.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d2fe4c45.697938",\r
+    "id": "2b482f66.6e7e5",\r
     "type": "switchNode",\r
     "name": "switch $foundVpnName",\r
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4800.616668701172,\r
-    "y": 7428.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4883.683334350586,\r
+    "y": 7510.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "5916bddb.120d64"\r
+        "e0a7a605.9205d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5916bddb.120d64",\r
+    "id": "e0a7a605.9205d8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4979.616668701172,\r
-    "y": 7427.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5062.683334350586,\r
+    "y": 7509.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "997dfd42.35e9c"\r
+        "86241828.71762"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "afa717d0.25e7a8",\r
+    "id": "811fcd41.48413",\r
     "type": "set",\r
     "name": "unset tmp.aai.all-vpn-bindings",\r
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",\r
     "comments": "",\r
-    "x": 4710.616668701172,\r
-    "y": 7066.116668701172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4793.683334350586,\r
+    "y": 7148.402420043945,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "46e10049.e35348",\r
+    "id": "9cc0dadb.189ef",\r
     "type": "set",\r
     "name": "unset secondary related variables",\r
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",\r
     "comments": "",\r
-    "x": 3276.2332763671875,\r
-    "y": 460.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3359.2999420166016,\r
+    "y": 542.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "26a90c3.2a56674",\r
+    "id": "79c99b01.4060a4",\r
     "type": "outcome",\r
     "name": "SECONDARY-ROOT",\r
     "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4051.332763671875,\r
-    "y": 521.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4134.399429321289,\r
+    "y": 603.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "949451da.c153b8"\r
+        "4bbb66bd.93eca"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "949451da.c153b8",\r
+    "id": "4bbb66bd.93eca",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4220.332763671875,\r
-    "y": 518.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4303.399429321289,\r
+    "y": 600.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "33bf54d9.6913cc",\r
-        "9e64bdfc.fb79a8"\r
+        "506bfd50.24ebdc",\r
+        "e2033e30.afcd1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "33bf54d9.6913cc",\r
+    "id": "506bfd50.24ebdc",\r
     "type": "set",\r
     "name": "set network-route-SECONDARY-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4444.332763671875,\r
-    "y": 551.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4527.399429321289,\r
+    "y": 633.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9e64bdfc.fb79a8",\r
+    "id": "e2033e30.afcd1",\r
     "type": "set",\r
     "name": "set network-route-C",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4390.332763671875,\r
-    "y": 591.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4473.399429321289,\r
+    "y": 673.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "16154f9d.14a3b",\r
+    "id": "fb5e94da.526bd",\r
     "type": "outcome",\r
     "name": "SECONDARY-ROOT",\r
     "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4016.333251953125,\r
-    "y": 720.7666625976562,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4099.399917602539,\r
+    "y": 803.0524139404297,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "85975abf.6c518"\r
+        "2507bbe.52fb3c4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "85975abf.6c518",\r
+    "id": "2507bbe.52fb3c4",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4181.33251953125,\r
-    "y": 725.7666625976562,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4264.399185180664,\r
+    "y": 808.0524139404297,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "adebbb96.d8f2f",\r
-        "88877892.df83d8"\r
+        "93fd5f76.e542d8",\r
+        "736d4375.48de7c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "adebbb96.d8f2f",\r
+    "id": "93fd5f76.e542d8",\r
     "type": "set",\r
     "name": "set network-route-SECONDARY-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4428.332763671875,\r
-    "y": 807.7666625976562,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4511.399429321289,\r
+    "y": 890.0524139404297,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "88877892.df83d8",\r
+    "id": "736d4375.48de7c",\r
     "type": "set",\r
     "name": "set network-route-C",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4374.332763671875,\r
-    "y": 847.7666625976562,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4457.399429321289,\r
+    "y": 930.0524139404297,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f55201f.0be188",\r
+    "id": "e9c6a99.90dcbd8",\r
     "type": "save",\r
     "name": "get network-route-three from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3259.333251953125,\r
-    "y": 859.7666625976562,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3342.399917602539,\r
+    "y": 942.0524139404297,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e0b52eb6.aea228",\r
-        "c2961466.a099a8",\r
-        "6a533bc.97a86c4"\r
+        "554ea6a8.9888f",\r
+        "3be7a41.d9c04dc",\r
+        "65e70654.5cdcc8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e0b52eb6.aea228",\r
+    "id": "554ea6a8.9888f",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3501.333251953125,\r
-    "y": 852.7666625976562,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3584.399917602539,\r
+    "y": 935.0524139404297,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c2961466.a099a8",\r
+    "id": "3be7a41.d9c04dc",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3496.842315673828,\r
-    "y": 895.1927185058594,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3579.908981323242,\r
+    "y": 977.4784698486328,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6a533bc.97a86c4",\r
+    "id": "65e70654.5cdcc8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3500.84228515625,\r
-    "y": 943.1926879882812,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3583.908950805664,\r
+    "y": 1025.4784393310547,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "83cc008.07d49"\r
+        "834a986c.4e7048"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "83cc008.07d49",\r
+    "id": "834a986c.4e7048",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3662.333251953125,\r
-    "y": 883.7666625976562,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3745.399917602539,\r
+    "y": 966.0524139404297,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2318951c.d8223a"\r
+        "f5a8155b.186e1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2318951c.d8223a",\r
+    "id": "f5a8155b.186e1",\r
     "type": "switchNode",\r
     "name": "switch nr type",\r
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3833.333251953125,\r
-    "y": 883.766845703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3916.399917602539,\r
+    "y": 966.0525970458984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1ecaee8d.2e04b1",\r
-        "6f57dead.f93a98",\r
-        "743eca24.c93994"\r
+        "49a01940.91879",\r
+        "fb61a82e.a48e6",\r
+        "bf3bb014.cd44d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1ecaee8d.2e04b1",\r
+    "id": "49a01940.91879",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4000.3330078125,\r
-    "y": 793.7667846679688,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4083.399673461914,\r
+    "y": 876.0525360107422,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ced307c.4c3f7f8"\r
+        "13796778.1bcaa1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6f57dead.f93a98",\r
+    "id": "fb61a82e.a48e6",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4002.3330078125,\r
-    "y": 847.7667846679688,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4085.399673461914,\r
+    "y": 930.0525360107422,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e2f995cd.e955"\r
+        "dfa37602.2a592"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ced307c.4c3f7f8",\r
+    "id": "13796778.1bcaa1",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4128.3330078125,\r
-    "y": 793.7667846679688,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4211.399673461914,\r
+    "y": 876.0525360107422,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "36a6204d.62e268",\r
-        "94b8b644.43f75"\r
+        "c61c7290.5d0048",\r
+        "9330928e.78e4a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e2f995cd.e955",\r
+    "id": "dfa37602.2a592",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4131.3330078125,\r
-    "y": 846.7667846679688,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4214.399673461914,\r
+    "y": 929.0525360107422,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7b0ab608.42ea9",\r
-        "a90ad8f1.fdc558"\r
+        "b3bef05d.261898",\r
+        "4885c383.a5f124"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "94b8b644.43f75",\r
+    "id": "9330928e.78e4a8",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4374.332763671875,\r
-    "y": 932.7667846679688,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4457.399429321289,\r
+    "y": 1015.0525360107422,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7b0ab608.42ea9",\r
+    "id": "b3bef05d.261898",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4391.332763671875,\r
-    "y": 974.7667846679688,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4474.399429321289,\r
+    "y": 1057.0525360107422,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a90ad8f1.fdc558",\r
+    "id": "4885c383.a5f124",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4376.332763671875,\r
-    "y": 1012.7667846679688,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4459.399429321289,\r
+    "y": 1095.0525360107422,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "36a6204d.62e268",\r
+    "id": "c61c7290.5d0048",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4388.332763671875,\r
-    "y": 892.7667846679688,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4471.399429321289,\r
+    "y": 975.0525360107422,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "467d675.a17d518",\r
+    "id": "3c2a776f.fcd778",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4553.332763671875,\r
-    "y": 908.7667846679688,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4636.399429321289,\r
+    "y": 991.0525360107422,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "743eca24.c93994",\r
+    "id": "bf3bb014.cd44d",\r
     "type": "outcome",\r
     "name": "SECONDARY-ROOT",\r
     "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3941.333251953125,\r
-    "y": 938.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4024.399917602539,\r
+    "y": 1021.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "32cfa81c.1fdfe"\r
+        "4b490f7e.359388"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "32cfa81c.1fdfe",\r
+    "id": "4b490f7e.359388",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4115.333251953125,\r
-    "y": 933.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4198.399917602539,\r
+    "y": 1016.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7ba10fb0.49acb8",\r
-        "c1eb138a.5c454"\r
+        "14062c05.c0d224",\r
+        "a29138d9.9f86a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c1eb138a.5c454",\r
+    "id": "a29138d9.9f86a8",\r
     "type": "set",\r
     "name": "set network-route-C",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4348.332763671875,\r
-    "y": 1102.7665405273438,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4431.399429321289,\r
+    "y": 1185.0522918701172,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7ba10fb0.49acb8",\r
+    "id": "14062c05.c0d224",\r
     "type": "set",\r
     "name": "set network-route-SECONDARY-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4402.332763671875,\r
-    "y": 1062.7665405273438,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4485.399429321289,\r
+    "y": 1145.0522918701172,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f3ed1968.f2e4c",\r
+    "id": "de8acab8.aa46c",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4516.332763671875,\r
-    "y": 1087.7665405273438,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4599.399429321289,\r
+    "y": 1170.0522918701172,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9301f497.efdba",\r
+    "id": "fd1dbeb5.643a7",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3517,\r
-    "y": 2168,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3600.066665649414,\r
+    "y": 2250.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7448f46b.34e6cc",\r
-        "5277238e.78ec8c"\r
+        "c723b1c5.5db71",\r
+        "935dac93.06ba68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "48753b32.6fce64",\r
+    "id": "bc4d7dbf.afb29",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3344.33349609375,\r
-    "y": 2169,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3427.400161743164,\r
+    "y": 2251.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9301f497.efdba"\r
+        "fd1dbeb5.643a7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7b2bdccd.4a3854",\r
+    "id": "e6ea02c1.c3c8b",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3353.824462890625,\r
-    "y": 2211.5740356445312,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3436.891128540039,\r
+    "y": 2293.8597869873047,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9a4a0275.086048",\r
+    "id": "4af5d292.f0e44c",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3342.33349609375,\r
-    "y": 2258,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3425.400161743164,\r
+    "y": 2340.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7448f46b.34e6cc",\r
+    "id": "c723b1c5.5db71",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3803.33349609375,\r
-    "y": 2172.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3886.400161743164,\r
+    "y": 2254.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "645217a3.91825",\r
-        "af1d3f52.b0745"\r
+        "e1f3a987.bed2a8",\r
+        "cd75a949.bbc878"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af1d3f52.b0745",\r
+    "id": "cd75a949.bbc878",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4026.33349609375,\r
-    "y": 2127.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4109.400161743164,\r
+    "y": 2209.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "731452c3.85af84"\r
+        "c2b43a53.588108"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "645217a3.91825",\r
+    "id": "e1f3a987.bed2a8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4028.33349609375,\r
-    "y": 2191.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4111.400161743164,\r
+    "y": 2273.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6089c716.00dec8"\r
+        "183afe84.247bf9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fa7f428c.6d6b2",\r
+    "id": "25934f35.38edd",\r
     "type": "save",\r
     "name": "get p-interface-dst from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3116.33349609375,\r
-    "y": 2204,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3199.400161743164,\r
+    "y": 2286.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "48753b32.6fce64",\r
-        "7b2bdccd.4a3854",\r
-        "9a4a0275.086048"\r
+        "bc4d7dbf.afb29",\r
+        "e6ea02c1.c3c8b",\r
+        "4af5d292.f0e44c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c73afdde.7fd758",\r
+    "id": "e6f36ca.9e7909",\r
     "type": "comment",\r
     "name": "Question?",\r
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
     "comments": "",\r
-    "x": 3077.33349609375,\r
-    "y": 2148,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3160.400161743164,\r
+    "y": 2230.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6834572.668ee28",\r
+    "id": "4a92500a.dfe688",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3136.33349609375,\r
-    "y": 1944,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3219.400161743164,\r
+    "y": 2026.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2bef51bc.6ca236",\r
-        "6cf1c76e.88753"\r
+        "f38e9f0f.aeb28",\r
+        "c00bcf8d.007da8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6cf1c76e.88753",\r
+    "id": "c00bcf8d.007da8",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3359.33349609375,\r
-    "y": 1930,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3442.400161743164,\r
+    "y": 2012.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f6f8952c.2953"\r
+        "8c221cd.f6641e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2bef51bc.6ca236",\r
+    "id": "f38e9f0f.aeb28",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3361.33349609375,\r
-    "y": 1963,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3444.400161743164,\r
+    "y": 2045.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f6f8952c.2953",\r
+    "id": "8c221cd.f6641e",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3507.33349609375,\r
-    "y": 1923,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3590.400161743164,\r
+    "y": 2005.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f448bb3c.4541c8",\r
-        "dafe2b52.c4e9d"\r
+        "7fdb72b7.69f4e4",\r
+        "70d5d0aa.d1559"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f448bb3c.4541c8",\r
+    "id": "7fdb72b7.69f4e4",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",\r
     "comments": "",\r
-    "x": 3701.33349609375,\r
-    "y": 1926.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3784.400161743164,\r
+    "y": 2008.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5277238e.78ec8c",\r
+    "id": "935dac93.06ba68",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3754.333465576172,\r
-    "y": 2294.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3837.400131225586,\r
+    "y": 2377.2857208251953,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "eb06fc3b.085ab"\r
+        "bb098115.17482"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb06fc3b.085ab",\r
+    "id": "bb098115.17482",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3960.333465576172,\r
-    "y": 2294.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4043.400131225586,\r
+    "y": 2377.2857208251953,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a014a0c0.bb63d8"\r
+        "eb63cf64.6fcac8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dafe2b52.c4e9d",\r
+    "id": "70d5d0aa.d1559",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3723.33349609375,\r
-    "y": 1994.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3806.400161743164,\r
+    "y": 2076.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a21fb44.41309c8",\r
-        "5685afe4.0b1f1",\r
-        "ea909548.33d5a"\r
+        "4772aa88.8815f4",\r
+        "2f88517d.a786fe",\r
+        "a51a10da.7f1bc8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a21fb44.41309c8",\r
+    "id": "4772aa88.8815f4",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3918.8336181640625,\r
-    "y": 1946.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4001.9002838134766,\r
+    "y": 2028.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9cea62e1.55972"\r
+        "bea56767.e75718"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5685afe4.0b1f1",\r
+    "id": "2f88517d.a786fe",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3910.8336181640625,\r
-    "y": 2001.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3993.9002838134766,\r
+    "y": 2083.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "89031999.da34c"\r
+        "3775c8.545c2238"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ea909548.33d5a",\r
+    "id": "a51a10da.7f1bc8",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3915.8336181640625,\r
-    "y": 2058.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3998.9002838134766,\r
+    "y": 2140.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c3bf7f9d.8f5d8"\r
+        "afbc062e.468e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c3bf7f9d.8f5d8",\r
+    "id": "afbc062e.468e",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4067.8336181640625,\r
-    "y": 2059.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4150.900283813477,\r
+    "y": 2141.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9cea62e1.55972",\r
+    "id": "bea56767.e75718",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4063.2159423828125,\r
-    "y": 1943.6557922363281,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4146.282608032227,\r
+    "y": 2025.9415435791016,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e8d406ab.082b08"\r
+        "80389683.dd0d1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8c5d257.6a579d8",\r
+    "id": "77f3463a.2b447",\r
     "type": "set",\r
     "name": "set SECONDARY-ROOT stuff",\r
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3139,\r
-    "y": 2283,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3222.066665649414,\r
+    "y": 2365.2857513427734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5e59531e.4360fc",\r
+    "id": "75f1943f.b94b8c",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3813.999969482422,\r
-    "y": 2246.999969482422,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3897.066635131836,\r
+    "y": 2329.2857208251953,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6089c716.00dec8",\r
+    "id": "183afe84.247bf9",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 4187.33349609375,\r
-    "y": 2210.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4270.400161743164,\r
+    "y": 2292.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "731452c3.85af84",\r
+    "id": "c2b43a53.588108",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4191.33349609375,\r
-    "y": 2124.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4274.400161743164,\r
+    "y": 2206.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8743a739.8d80e8",\r
-        "538193e1.eab6f4"\r
+        "62ce6308.22a894",\r
+        "3f411974.bc06ee"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a014a0c0.bb63d8",\r
+    "id": "eb63cf64.6fcac8",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4177.619110107422,\r
-    "y": 2293.821746826172,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4260.685775756836,\r
+    "y": 2376.1074981689453,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "62c06921.59013"\r
+        "68a23803.3ba65"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "89031999.da34c",\r
+    "id": "3775c8.545c2238",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 4078.8336181640625,\r
-    "y": 2004.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4161.900283813477,\r
+    "y": 2086.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8743a739.8d80e8",\r
+    "id": "62ce6308.22a894",\r
     "type": "set",\r
     "name": "set ltpId",\r
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",\r
     "comments": "",\r
-    "x": 4361.33349609375,\r
-    "y": 2085.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4444.400161743164,\r
+    "y": 2167.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "538193e1.eab6f4",\r
+    "id": "3f411974.bc06ee",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",\r
     "comments": "",\r
-    "x": 4362.33349609375,\r
-    "y": 2190.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4445.400161743164,\r
+    "y": 2272.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a7a60345.c4fe3",\r
+    "id": "6316b810.f1aee8",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
     "comments": "",\r
-    "x": 4357.33349609375,\r
-    "y": 2139.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4440.400161743164,\r
+    "y": 2221.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "62c06921.59013",\r
+    "id": "68a23803.3ba65",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4384.450653076172,\r
-    "y": 2283.3404235839844,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4467.517318725586,\r
+    "y": 2365.626174926758,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "61f01ac9.4769c4",\r
-        "6f3f4bab.137934",\r
-        "b1be6cb6.4fb618"\r
+        "affb5b24.b6cca8",\r
+        "4a56bfa4.77eef",\r
+        "2836e90b.67e1be"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "61f01ac9.4769c4",\r
+    "id": "affb5b24.b6cca8",\r
     "type": "set",\r
     "name": "set destination ttp-id",\r
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 4599.450653076172,\r
-    "y": 2245.3404235839844,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4682.517318725586,\r
+    "y": 2327.626174926758,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6f3f4bab.137934",\r
+    "id": "4a56bfa4.77eef",\r
     "type": "get-resource",\r
     "name": "get-resource src TTP",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4596.450653076172,\r
-    "y": 2284.3404235839844,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4679.517318725586,\r
+    "y": 2366.626174926758,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "2692e306.96b09c"\r
+        "963f6cd5.b5f28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b1be6cb6.4fb618",\r
+    "id": "2836e90b.67e1be",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4551.950653076172,\r
-    "y": 2326.3404235839844,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4635.017318725586,\r
+    "y": 2408.626174926758,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "50016039.86678",\r
+    "id": "2cd6b3b7.1e0b44",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4645.33349609375,\r
-    "y": 1962.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4728.400161743164,\r
+    "y": 2044.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "19550590.021992"\r
+        "af33acb2.7cd3c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e8d406ab.082b08",\r
+    "id": "80389683.dd0d1",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4247.33349609375,\r
-    "y": 1958.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4330.400161743164,\r
+    "y": 2040.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6de4be31.1810b"\r
+        "6ef2734a.a2ab44"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6de4be31.1810b",\r
+    "id": "6ef2734a.a2ab44",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4442.33349609375,\r
-    "y": 1958.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4525.400161743164,\r
+    "y": 2040.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "50016039.86678",\r
-        "cba34b2.471f9b8"\r
+        "2cd6b3b7.1e0b44",\r
+        "a9acfdfb.534e9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cba34b2.471f9b8",\r
+    "id": "a9acfdfb.534e9",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4647.33349609375,\r
-    "y": 2035.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4730.400161743164,\r
+    "y": 2117.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "af92238d.b3b23"\r
+        "3ae5ea54.6e54a6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2692e306.96b09c",\r
+    "id": "963f6cd5.b5f28",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4776.950653076172,\r
-    "y": 2283.3404235839844,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4860.017318725586,\r
+    "y": 2365.626174926758,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b1246264.28f0f"\r
+        "e92c023f.140be8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b1246264.28f0f",\r
+    "id": "e92c023f.140be8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4934.950653076172,\r
-    "y": 2283.3404235839844,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5018.017318725586,\r
+    "y": 2365.626174926758,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "fd4ac373.f8f388"\r
+        "b67ecfac.fb906"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fd4ac373.f8f388",\r
+    "id": "b67ecfac.fb906",\r
     "type": "set",\r
     "name": "set destination tunnel tp ip",\r
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",\r
     "comments": "",\r
-    "x": 5141.950653076172,\r
-    "y": 2283.3404235839844,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5225.017318725586,\r
+    "y": 2365.626174926758,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "19550590.021992",\r
+    "id": "af33acb2.7cd3c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4822.33349609375,\r
-    "y": 1954.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4905.400161743164,\r
+    "y": 2036.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f2beac88.eedd2",\r
-        "e37f582f.5a4c9"\r
+        "21a9bcb5.4aa85c",\r
+        "c4167bd6.551f58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e37f582f.5a4c9",\r
+    "id": "c4167bd6.551f58",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5030.33349609375,\r
-    "y": 1961.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5113.400161743164,\r
+    "y": 2043.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6a3803eb.9852cc",\r
-        "9a9acadd.82809",\r
-        "a1039497.bae268"\r
+        "8ae061a9.0d8d7",\r
+        "7fc92de3.a78f3c",\r
+        "220302ba.be0f7e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af92238d.b3b23",\r
+    "id": "3ae5ea54.6e54a6",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4824.33349609375,\r
-    "y": 2027.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4907.400161743164,\r
+    "y": 2109.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "99f85b9c.2a8238"\r
+        "256fff1.5dd26"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f2beac88.eedd2",\r
+    "id": "21a9bcb5.4aa85c",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainC id",\r
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5060.33349609375,\r
-    "y": 1909.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5143.400161743164,\r
+    "y": 1991.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "99f85b9c.2a8238",\r
+    "id": "256fff1.5dd26",\r
     "type": "set",\r
     "name": "set domainC ethernet layer network-id",\r
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
     "comments": "",\r
-    "x": 5059.33349609375,\r
-    "y": 2151.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5142.400161743164,\r
+    "y": 2233.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6a3803eb.9852cc",\r
+    "id": "8ae061a9.0d8d7",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5240.33349609375,\r
-    "y": 1952.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5323.400161743164,\r
+    "y": 2034.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f25a9292.d1fb4"\r
+        "9c166c79.f96aa8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9a9acadd.82809",\r
+    "id": "7fc92de3.a78f3c",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5232.33349609375,\r
-    "y": 2007.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5315.400161743164,\r
+    "y": 2089.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7db8b6f1.adecb8"\r
+        "f289682c.7a8f28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a1039497.bae268",\r
+    "id": "220302ba.be0f7e",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5237.33349609375,\r
-    "y": 2064.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5320.400161743164,\r
+    "y": 2146.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e3bf692a.f4e238"\r
+        "700667b1.628978"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e3bf692a.f4e238",\r
+    "id": "700667b1.628978",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5389.33349609375,\r
-    "y": 2065.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5472.400161743164,\r
+    "y": 2147.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7db8b6f1.adecb8",\r
+    "id": "f289682c.7a8f28",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5400.33349609375,\r
-    "y": 2010.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5483.400161743164,\r
+    "y": 2092.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f25a9292.d1fb4",\r
+    "id": "9c166c79.f96aa8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5384.7158203125,\r
-    "y": 1949.6557922363281,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5467.782485961914,\r
+    "y": 2031.9415435791016,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "fbf54d7c.8184a"\r
+        "cc2fb272.8011c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fbf54d7c.8184a",\r
+    "id": "cc2fb272.8011c",\r
     "type": "set",\r
     "name": "set controller domainC data",\r
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
     "comments": "",\r
-    "x": 5599.33349609375,\r
-    "y": 1946.0001220703125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5682.400161743164,\r
+    "y": 2028.285873413086,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c067ce8c.82bd2",\r
+    "id": "6be3a1db.a02ba8",\r
     "type": "comment",\r
     "name": "Create SECONDARY-ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5628.83349609375,\r
-    "y": 2068.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5711.900161743164,\r
+    "y": 2151.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "858f96c1.79cbc",\r
+    "id": "c91e3a5e.c6511",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5600.9501953125,\r
-    "y": 2117.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5684.016860961914,\r
+    "y": 2200.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8c0e0f7f.469198"\r
+        "8269b8aa.68a3b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8c0e0f7f.469198",\r
+    "id": "8269b8aa.68a3b",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5791.9501953125,\r
-    "y": 2121.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5875.016860961914,\r
+    "y": 2204.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a3faa53c.d04c58"\r
+        "8a849c85.456228"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a3faa53c.d04c58",\r
+    "id": "8a849c85.456228",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5918.9501953125,\r
-    "y": 2120.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6002.016860961914,\r
+    "y": 2203.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "53f62ca7.7b47cc",\r
-        "582e0a2f.97b604"\r
+        "5d5d757b.d8e52c",\r
+        "a560a2f0.7f8828"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "582e0a2f.97b604",\r
+    "id": "a560a2f0.7f8828",\r
     "type": "save",\r
     "name": "save SECONDARY-ROOT UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6140.9501953125,\r
-    "y": 2009.88330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6224.016860961914,\r
+    "y": 2092.1690521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "53f62ca7.7b47cc",\r
+    "id": "5d5d757b.d8e52c",\r
     "type": "switchNode",\r
     "name": "switch 2-ROOTS in same domain?",\r
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6136.83349609375,\r
-    "y": 2068.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6219.900161743164,\r
+    "y": 2151.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "142e04ee.e3d34b",\r
-        "257ca4bf.8f052c"\r
+        "51d8510d.dcc058",\r
+        "79e7df30.7f8138"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "142e04ee.e3d34b",\r
+    "id": "51d8510d.dcc058",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6346.83349609375,\r
-    "y": 2045.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6429.900161743164,\r
+    "y": 2128.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9407e67d.da2418"\r
+        "b3aa8483.9bdec"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9407e67d.da2418",\r
+    "id": "b3aa8483.9bdec",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6472.83349609375,\r
-    "y": 2045.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6555.900161743164,\r
+    "y": 2128.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "cd746c7.fc5cf1"\r
+        "50564c45.182124"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f87ebbbb.7e40d",\r
+    "id": "eaeffe9b.6e1578",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6477.83349609375,\r
-    "y": 2094.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6560.900161743164,\r
+    "y": 2177.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "88ec87d6.84288",\r
-        "29cb92cc.e394be",\r
-        "74fc1523.42a1e4",\r
-        "f8b2efa2.8dbc38"\r
+        "5ed2f363.68208c",\r
+        "ad95a077.a4baa8",\r
+        "283ec58.ad1d4ba",\r
+        "ccdfc934.795ad8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "257ca4bf.8f052c",\r
+    "id": "79e7df30.7f8138",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6351.83349609375,\r
-    "y": 2094.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6434.900161743164,\r
+    "y": 2177.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f87ebbbb.7e40d"\r
+        "eaeffe9b.6e1578"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cd746c7.fc5cf1",\r
+    "id": "50564c45.182124",\r
     "type": "save",\r
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6800.83349609375,\r
-    "y": 2042.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6883.900161743164,\r
+    "y": 2125.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "88ec87d6.84288",\r
+    "id": "5ed2f363.68208c",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainC",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6753.83349609375,\r
-    "y": 2133.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6836.900161743164,\r
+    "y": 2216.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "29cb92cc.e394be",\r
+    "id": "ad95a077.a4baa8",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
-    "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",\r
+    "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6701.83349609375,\r
-    "y": 2175.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6784.900161743164,\r
+    "y": 2258.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "74fc1523.42a1e4",\r
+    "id": "283ec58.ad1d4ba",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6830.83349609375,\r
-    "y": 2217.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6913.900161743164,\r
+    "y": 2300.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fdca37c0.7ca06",\r
+    "id": "192e2e3d.32bda2",\r
     "type": "comment",\r
     "name": "Create SECONDARY-ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6716.83349609375,\r
-    "y": 2090.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6799.900161743164,\r
+    "y": 2173.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f8b2efa2.8dbc38",\r
+    "id": "ccdfc934.795ad8",\r
     "type": "save",\r
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6808.83349609375,\r
-    "y": 2265.7666015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6891.900161743164,\r
+    "y": 2348.0523529052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1b0442b9.4b628d",\r
+    "id": "162cf27b.802c36",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6372.83349609375,\r
-    "y": 2762.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6455.900161743164,\r
+    "y": 2844.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "12529b57.e28025"\r
+        "b694c10f.97993"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "12529b57.e28025",\r
+    "id": "b694c10f.97993",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6564.83349609375,\r
-    "y": 2757.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6647.900161743164,\r
+    "y": 2839.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "78bbff94.82c65"\r
+        "5f9a1d2b.927d2c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "78bbff94.82c65",\r
+    "id": "5f9a1d2b.927d2c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6693.83349609375,\r
-    "y": 2757.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6776.900161743164,\r
+    "y": 2839.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c9dee4ca.bc2dc"\r
+        "2368c13a.48b366"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c9dee4ca.bc2dc",\r
+    "id": "2368c13a.48b366",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 7025.83349609375,\r
-    "y": 2755.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 7108.900161743164,\r
+    "y": 2837.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c1546bd.e66d418",\r
+    "id": "5a5c80f6.6318b8",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5957.83349609375,\r
-    "y": 2974.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6040.900161743164,\r
+    "y": 3056.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "13b9a3fa.0e3ae4"\r
+        "c941a0b5.409658"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "13b9a3fa.0e3ae4",\r
+    "id": "c941a0b5.409658",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6137.83349609375,\r
-    "y": 2973.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6220.900161743164,\r
+    "y": 3055.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e57b12b2.74ef18"\r
+        "e3672c28.52e2c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e57b12b2.74ef18",\r
+    "id": "e3672c28.52e2c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6266.83349609375,\r
-    "y": 2973.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6349.900161743164,\r
+    "y": 3055.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c79e7977.2b3cc8"\r
+        "78510894.01d168"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c79e7977.2b3cc8",\r
+    "id": "78510894.01d168",\r
     "type": "switchNode",\r
     "name": "switch 2-ROOTS in same domain?",\r
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6484.716796875,\r
-    "y": 2972.449951171875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6567.783462524414,\r
+    "y": 3054.7357025146484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "76ccfb33.2c6e3c"\r
+        "7f59bec0.83cea8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "76ccfb33.2c6e3c",\r
+    "id": "7f59bec0.83cea8",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6699.716796875,\r
-    "y": 2972.449951171875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6782.783462524414,\r
+    "y": 3054.7357025146484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f287a7b9.c4a8b"\r
+        "bd133df9.897ce8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f287a7b9.c4a8b",\r
+    "id": "bd133df9.897ce8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6831.716796875,\r
-    "y": 2972.449951171875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 6914.783462524414,\r
+    "y": 3054.7357025146484,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "3f3acb0.03380b6"\r
+        "5e2761fa.54e448"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3f3acb0.03380b6",\r
+    "id": "5e2761fa.54e448",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 7195.83349609375,\r
-    "y": 2971.566650390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 7278.900161743164,\r
+    "y": 3053.8524017333984,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3c12d321.f6ab2c",\r
+    "id": "9f73e0e4.5bd9a8",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4928.33251953125,\r
-    "y": 2622.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5011.399185180664,\r
+    "y": 2704.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "700dbefa.a5007"\r
+        "3e0d324f.39029e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "700dbefa.a5007",\r
+    "id": "3e0d324f.39029e",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5108.33251953125,\r
-    "y": 2621.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5191.399185180664,\r
+    "y": 2703.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "c3579242.e478c8"\r
+        "2acf977a.ab8578"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c3579242.e478c8",\r
+    "id": "2acf977a.ab8578",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5237.33251953125,\r
-    "y": 2621.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5320.399185180664,\r
+    "y": 2703.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "69f846d5.9ccd18"\r
+        "94be4455.78db28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cdd1f45b.46fb58",\r
+    "id": "83e5c66f.42223",\r
     "type": "comment",\r
     "name": "Update SECONDARY-ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4973.33251953125,\r
-    "y": 2680.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5056.399185180664,\r
+    "y": 2762.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "69f846d5.9ccd18",\r
+    "id": "94be4455.78db28",\r
     "type": "save",\r
     "name": "get S-root uni from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5003.33251953125,\r
-    "y": 2713.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5086.399185180664,\r
+    "y": 2795.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "622ffdb0.75cb54",\r
-        "c593ae10.f47a3",\r
-        "24e47d1.d702d82"\r
+        "e215df2d.d0af58",\r
+        "4a2bacef.6efd64",\r
+        "5a609856.e771c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c593ae10.f47a3",\r
+    "id": "4a2bacef.6efd64",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5184.823486328125,\r
-    "y": 2690.70751953125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5267.890151977539,\r
+    "y": 2772.9932708740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "439fba81.48a81c"\r
+        "8ad6e6e5.397628"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "24e47d1.d702d82",\r
+    "id": "5a609856.e771c",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5173.33251953125,\r
-    "y": 2730.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5256.399185180664,\r
+    "y": 2812.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e58b129f.993b8"\r
+        "e676f166.0b9d7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "439fba81.48a81c",\r
+    "id": "8ad6e6e5.397628",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5344.39501953125,\r
-    "y": 2688.9931640625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5427.461685180664,\r
+    "y": 2771.2789154052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e58b129f.993b8",\r
+    "id": "e676f166.0b9d7",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 5334.33251953125,\r
-    "y": 2731.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5417.399185180664,\r
+    "y": 2813.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "622ffdb0.75cb54",\r
+    "id": "e215df2d.d0af58",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5178.33251953125,\r
-    "y": 2767.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5261.399185180664,\r
+    "y": 2849.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "ea27280d.d02bf8"\r
+        "c842a7cf.827af"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ea27280d.d02bf8",\r
+    "id": "c842a7cf.827af",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5336.33251953125,\r
-    "y": 2775.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5419.399185180664,\r
+    "y": 2857.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "5d2e8885.4f468",\r
-        "6cb98496.dc88f4"\r
+        "c480afef.6388b8",\r
+        "1261035b.27b08d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5d2e8885.4f468",\r
+    "id": "c480afef.6388b8",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 5497.33251953125,\r
-    "y": 2707.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5580.399185180664,\r
+    "y": 2789.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6cb98496.dc88f4",\r
+    "id": "1261035b.27b08d",\r
     "type": "save",\r
     "name": "update S-ROOT UNI in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5539.33251953125,\r
-    "y": 2779.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5622.399185180664,\r
+    "y": 2861.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d39256ff.c99e4",\r
+    "id": "37f3e792.01b98",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5015.33251953125,\r
-    "y": 2980.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5098.399185180664,\r
+    "y": 3062.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "9b669929.a8064"\r
+        "f8a6bae7.e43428"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9b669929.a8064",\r
+    "id": "f8a6bae7.e43428",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5195.33251953125,\r
-    "y": 2979.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5278.399185180664,\r
+    "y": 3061.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "479be729.dc0248"\r
+        "ebf9b17f.54212"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "479be729.dc0248",\r
+    "id": "ebf9b17f.54212",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5324.33251953125,\r
-    "y": 2979.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5407.399185180664,\r
+    "y": 3061.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "96ab8e09.feb69"\r
+        "7632b9a7.046188"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "89e60282.d93268",\r
+    "id": "a3e62ac2.613cb8",\r
     "type": "comment",\r
     "name": "Update SECONDARY-ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5060.33251953125,\r
-    "y": 3038.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5143.399185180664,\r
+    "y": 3120.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "96ab8e09.feb69",\r
+    "id": "7632b9a7.046188",\r
     "type": "save",\r
     "name": "get S-root uni from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5090.33251953125,\r
-    "y": 3071.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5173.399185180664,\r
+    "y": 3153.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "d8822576.b3585",\r
-        "75b8d325.77424c",\r
-        "c70dc607.d25bf8"\r
+        "aa9ebc0c.15b74",\r
+        "34556fac.9550b8",\r
+        "8f78cb97.869598"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "75b8d325.77424c",\r
+    "id": "34556fac.9550b8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5271.823486328125,\r
-    "y": 3048.70751953125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5354.890151977539,\r
+    "y": 3130.9932708740234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1c3be14a.a5638f"\r
+        "81becde2.b2238"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c70dc607.d25bf8",\r
+    "id": "8f78cb97.869598",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5260.33251953125,\r
-    "y": 3088.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5343.399185180664,\r
+    "y": 3170.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "57a20811.9713c"\r
+        "1e2ed61a.69a74a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1c3be14a.a5638f",\r
+    "id": "81becde2.b2238",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 5431.39501953125,\r
-    "y": 3046.9931640625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5514.461685180664,\r
+    "y": 3129.2789154052734,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "57a20811.9713c",\r
+    "id": "1e2ed61a.69a74a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 5421.33251953125,\r
-    "y": 3089.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5504.399185180664,\r
+    "y": 3171.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d8822576.b3585",\r
+    "id": "aa9ebc0c.15b74",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5265.33251953125,\r
-    "y": 3125.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5348.399185180664,\r
+    "y": 3207.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "89319d00.a640d8"\r
+        "a5e9d80e.798b58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "89319d00.a640d8",\r
+    "id": "a5e9d80e.798b58",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5423.33251953125,\r
-    "y": 3133.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5506.399185180664,\r
+    "y": 3215.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "f52ef279.5e2fa8",\r
-        "ebb57be1.fff538"\r
+        "f6d35763.a75968",\r
+        "4c3e3376.aec354"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f52ef279.5e2fa8",\r
+    "id": "f6d35763.a75968",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 5584.33251953125,\r
-    "y": 3065.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5667.399185180664,\r
+    "y": 3147.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ebb57be1.fff538",\r
+    "id": "4c3e3376.aec354",\r
     "type": "save",\r
     "name": "update S-ROOT UNI in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5626.33251953125,\r
-    "y": 3137.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5709.399185180664,\r
+    "y": 3219.4190521240234,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b27458da.77b73",\r
+    "id": "54f08fa.71777f",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3497,\r
-    "y": 4562.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3580.066665649414,\r
+    "y": 4644.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "b7009e9a.816708"\r
+        "f59f8a4e.ee5228"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b7009e9a.816708",\r
+    "id": "f59f8a4e.ee5228",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3677,\r
-    "y": 4561.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3760.066665649414,\r
+    "y": 4643.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "75b6f667.ff2f48"\r
+        "6dfc836d.44e47c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "75b6f667.ff2f48",\r
+    "id": "6dfc836d.44e47c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3806,\r
-    "y": 4561.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3889.066665649414,\r
+    "y": 4643.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e0e9d687.026568"\r
+        "84addd88.4602"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "93bf9820.efc6f",\r
+    "id": "8e14b0c3.7931e8",\r
     "type": "comment",\r
     "name": "Update SECONDARY-ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3542,\r
-    "y": 4620.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3625.066665649414,\r
+    "y": 4702.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e0e9d687.026568",\r
+    "id": "84addd88.4602",\r
     "type": "save",\r
     "name": "get S-root uni from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3572,\r
-    "y": 4653.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3655.066665649414,\r
+    "y": 4735.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6dcb758c.68fb4c",\r
-        "79d68d78.6f5a44",\r
-        "5d2b0296.8c0914"\r
+        "15dd9d01.198e13",\r
+        "99598358.2ea178",\r
+        "d0193baa.0b0ba8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "79d68d78.6f5a44",\r
+    "id": "99598358.2ea178",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3753.490966796875,\r
-    "y": 4630.70751953125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3836.557632446289,\r
+    "y": 4712.993270874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "283870b5.b39d78"\r
+        "4987dd19.729c2c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5d2b0296.8c0914",\r
+    "id": "d0193baa.0b0ba8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3742,\r
-    "y": 4670.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3825.066665649414,\r
+    "y": 4752.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "307bdbbc.e5590c"\r
+        "4de60967.145d88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "283870b5.b39d78",\r
+    "id": "4987dd19.729c2c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
     "comments": "",\r
-    "x": 3913.0625,\r
-    "y": 4628.9931640625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3996.129165649414,\r
+    "y": 4711.278915405273,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "307bdbbc.e5590c",\r
+    "id": "4de60967.145d88",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3903,\r
-    "y": 4671.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3986.066665649414,\r
+    "y": 4753.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6dcb758c.68fb4c",\r
+    "id": "15dd9d01.198e13",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3747,\r
-    "y": 4707.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3830.066665649414,\r
+    "y": 4789.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "22012b3c.a0e674"\r
+        "7135b7da.689598"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "22012b3c.a0e674",\r
+    "id": "7135b7da.689598",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3905,\r
-    "y": 4715.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3988.066665649414,\r
+    "y": 4797.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "7783af35.773e7",\r
-        "e7eec98c.ca59"\r
+        "db75607b.34ec4",\r
+        "368002b6.6c78de"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7783af35.773e7",\r
+    "id": "db75607b.34ec4",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 4066,\r
-    "y": 4647.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4149.066665649414,\r
+    "y": 4729.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e7eec98c.ca59",\r
+    "id": "368002b6.6c78de",\r
     "type": "save",\r
     "name": "update S-ROOT UNI in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4108,\r
-    "y": 4719.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4191.066665649414,\r
+    "y": 4801.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e87132f3.ee29c",\r
+    "id": "9630090a.96156",\r
     "type": "comment",\r
     "name": "populate connectivity-C variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4188.6669921875,\r
-    "y": 5517.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4271.733657836914,\r
+    "y": 5599.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cb7342b9.a9c168",\r
+    "id": "b727caf7.37ccd",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4343.6669921875,\r
-    "y": 5558.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4426.733657836914,\r
+    "y": 5640.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7a7c44d8.30aa44",\r
+    "id": "9d76b5ce.608a08",\r
     "type": "switchNode",\r
     "name": "switch found-secondary-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4159.6669921875,\r
-    "y": 5616.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4242.733657836914,\r
+    "y": 5698.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "8bec5884.15258",\r
-        "bb24a1ac.622598"\r
+        "6c688e63.a06ce",\r
+        "a407cbc4.6c0c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8bec5884.15258",\r
+    "id": "6c688e63.a06ce",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4395.6669921875,\r
-    "y": 5600.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4478.733657836914,\r
+    "y": 5682.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "6d098a3a.3afd8c"\r
+        "65c46de7.6d4354"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bb24a1ac.622598",\r
+    "id": "a407cbc4.6c0c8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4394.6669921875,\r
-    "y": 5648.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4477.733657836914,\r
+    "y": 5730.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6d098a3a.3afd8c",\r
+    "id": "65c46de7.6d4354",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4539.6669921875,\r
-    "y": 5602.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4622.733657836914,\r
+    "y": 5684.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "de9129b3.62ee98",\r
-        "95ed5b5c.afa778",\r
-        "140ab45c.08ae54"\r
+        "a13d8ec4.2f4c18",\r
+        "3e4d3365.1256fc",\r
+        "d2dac5fa.54c798"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "de9129b3.62ee98",\r
+    "id": "a13d8ec4.2f4c18",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainC-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 4951.667236328125,\r
-    "y": 5737.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5034.733901977539,\r
+    "y": 5819.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "95ed5b5c.afa778",\r
+    "id": "3e4d3365.1256fc",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5072.667236328125,\r
-    "y": 5784.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5155.733901977539,\r
+    "y": 5866.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bc8a01e6.d0596",\r
+    "id": "37767c8a.d0935c",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4955.551025390625,\r
-    "y": 5828.0166015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5038.617691040039,\r
+    "y": 5910.302352905273,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "140ab45c.08ae54",\r
+    "id": "d2dac5fa.54c798",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4954.334228515625,\r
-    "y": 5869.216796875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5037.400894165039,\r
+    "y": 5951.502548217773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4e2e6b5c.090cf4",\r
+    "id": "d0ed0f43.9ac178",\r
     "type": "comment",\r
     "name": "populate connectivity-C variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4815,\r
-    "y": 6123.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4898.066665649414,\r
+    "y": 6205.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8afd899a.01e88",\r
+    "id": "b5179b.b5811868",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4981,\r
-    "y": 6162.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5064.066665649414,\r
+    "y": 6244.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8c1f115c.700108",\r
+    "id": "8a0b9185.29b548",\r
     "type": "switchNode",\r
     "name": "switch found-secondary-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4820,\r
-    "y": 6212.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 4903.066665649414,\r
+    "y": 6294.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "53961644.a48598",\r
-        "58a624c5.6a1504"\r
+        "bb485e07.c51f48",\r
+        "f5c035ca.78263"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "53961644.a48598",\r
+    "id": "bb485e07.c51f48",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5053,\r
-    "y": 6206.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5136.066665649414,\r
+    "y": 6288.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1edcc228.5234b6"\r
+        "3bbd1b25.f0fda4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "58a624c5.6a1504",\r
+    "id": "f5c035ca.78263",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5054,\r
-    "y": 6256.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5137.066665649414,\r
+    "y": 6338.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1edcc228.5234b6",\r
+    "id": "3bbd1b25.f0fda4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5200,\r
-    "y": 6214.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5283.066665649414,\r
+    "y": 6296.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "a2cd952f.42f1c8",\r
-        "75bd12d0.4fb564",\r
-        "ddd98790.fa90d"\r
+        "e99c4f39.622098",\r
+        "424cf9d2.7701e8",\r
+        "2a6230e2.ffd498"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a2cd952f.42f1c8",\r
+    "id": "e99c4f39.622098",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainC-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 5447,\r
-    "y": 6202.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5530.066665649414,\r
+    "y": 6284.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "75bd12d0.4fb564",\r
+    "id": "424cf9d2.7701e8",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5568,\r
-    "y": 6249.13330078125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5651.066665649414,\r
+    "y": 6331.419052124023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6c605ae5.2dde2c",\r
+    "id": "b810129e.2691f8",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5450.8837890625,\r
-    "y": 6293.0166015625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5533.950454711914,\r
+    "y": 6375.302352905273,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ddd98790.fa90d",\r
+    "id": "2a6230e2.ffd498",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5449.6669921875,\r
-    "y": 6334.216796875,\r
-    "z": "4138d8f7.da252",\r
+    "x": 5532.733657836914,\r
+    "y": 6416.502548217773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e4c8e98f.2e48b8",\r
+    "id": "a198d826.7242b",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3577,\r
-    "y": 6107.56689453125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3660.066665649414,\r
+    "y": 6189.852645874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5e06fc8.b063184",\r
+    "id": "c717d5f4.4fddc8",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2914.25,\r
-    "y": 6105.81689453125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 2997.316665649414,\r
+    "y": 6188.102645874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "5aaa3311.116ad4",\r
-        "5f201884.9bf1b"\r
+        "420e4506.143cfc",\r
+        "beb3687c.2f0758"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5aaa3311.116ad4",\r
+    "id": "420e4506.143cfc",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3105.25,\r
-    "y": 6109.81689453125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3188.316665649414,\r
+    "y": 6192.102645874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "42b72649.a2611"\r
+        "75f23708.93f968"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "42b72649.a2611",\r
+    "id": "75f23708.93f968",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3232.25,\r
-    "y": 6108.81689453125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3315.316665649414,\r
+    "y": 6191.102645874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "e4c8e98f.2e48b8"\r
+        "a198d826.7242b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5f201884.9bf1b",\r
+    "id": "beb3687c.2f0758",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3101.25,\r
-    "y": 6179.81689453125,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3184.316665649414,\r
+    "y": 6262.102645874023,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "1e510c07.00530c"\r
+        "befff12f.84551"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "382dddaf.06eaa2",\r
+    "id": "41f38680.b5ae6",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3650.75,\r
-    "y": 6178.900390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3733.816665649414,\r
+    "y": 6261.186141967773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1e510c07.00530c",\r
+    "id": "befff12f.84551",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3234.75,\r
-    "y": 6181.900390625,\r
-    "z": "4138d8f7.da252",\r
+    "x": 3317.816665649414,\r
+    "y": 6264.186141967773,\r
+    "z": "2414cd0b.85dac2",\r
     "wires": [\r
       [\r
-        "382dddaf.06eaa2"\r
+        "41f38680.b5ae6"\r
       ]\r
     ]\r
   }\r

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 efad788..dc09364 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "58e34c1c.fa2ef4",\r
+        "id": "55da1918.a645e",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 169,\r
-        "y": 87,\r
-        "z": "740154b1.db9c44",\r
+        "x": 271.566650390625,\r
+        "y": 122.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "7debdd32.eca72c"\r
+                "1bc5ef1e.555379"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7debdd32.eca72c",\r
+        "id": "1bc5ef1e.555379",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,3805 +22,3805 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 316,\r
-        "y": 662.0000152587891,\r
-        "z": "740154b1.db9c44",\r
+        "x": 418.566650390625,\r
+        "y": 697.5666809082031,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "17937dc9.2355da"\r
+                "72a47d96.f0464c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17937dc9.2355da",\r
+        "id": "72a47d96.f0464c",\r
         "type": "method",\r
         "name": "tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 380.0001220703125,\r
-        "y": 755,\r
-        "z": "740154b1.db9c44",\r
+        "x": 482.5667724609375,\r
+        "y": 790.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "3e6ce739.eeb648"\r
+                "34c3e8c4.75c3c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d05eda9f.63c82",\r
+        "id": "c7e5fdd1.51b5a",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode getPath from OOF",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 425.9730682373047,\r
-        "y": 273.996000289917,\r
-        "z": "740154b1.db9c44",\r
+        "x": 528.5397186279297,\r
+        "y": 309.56266593933105,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "d4681312.af0c78",\r
-                "83728f7.d5447f"\r
+                "d6e108d2.5fc108",\r
+                "c846370c.449d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4681312.af0c78",\r
+        "id": "d6e108d2.5fc108",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 665.9732093811035,\r
-        "y": 297.99596977233887,\r
-        "z": "740154b1.db9c44",\r
+        "x": 768.5398597717285,\r
+        "y": 333.56263542175293,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "b7d4d2f2.ad66"\r
+                "33dac520.fd9612"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54760f3b.4160e8",\r
+        "id": "1749300b.377e9",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing OOF api\" />\n",\r
         "comments": "",\r
-        "x": 835.9731292724609,\r
-        "y": 237.99606132507324,\r
-        "z": "740154b1.db9c44",\r
+        "x": 938.5397796630859,\r
+        "y": 273.5627269744873,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83728f7.d5447f",\r
+        "id": "c846370c.449d6",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 664.9729957580566,\r
-        "y": 246.99606037139893,\r
-        "z": "740154b1.db9c44",\r
+        "x": 767.5396461486816,\r
+        "y": 282.562726020813,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "54760f3b.4160e8"\r
+                "1749300b.377e9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a1c3926.ccf68e",\r
+        "id": "aabf6007.38015",\r
         "type": "comment",\r
         "name": "OTN tunnel path computation",\r
         "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",\r
         "comments": "",\r
-        "x": 397.47686767578125,\r
-        "y": 230,\r
-        "z": "740154b1.db9c44",\r
+        "x": 500.04351806640625,\r
+        "y": 265.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b642d1e9.ee8bf8",\r
+        "id": "66a1cd55.f26304",\r
         "type": "for",\r
         "name": "for vidx..otn-oof.solutions_length[]",\r
         "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 853.972900390625,\r
-        "y": 723.2457275390625,\r
-        "z": "740154b1.db9c44",\r
+        "x": 956.53955078125,\r
+        "y": 758.8123931884766,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "782120ce.0449f"\r
+                "34bde7e7.01eac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e8a6121.3ebf8f",\r
+        "id": "b912adec.34afe",\r
         "type": "comment",\r
         "name": "Loop through OTN links",\r
         "info": "",\r
         "comments": "",\r
-        "x": 937.4732055664062,\r
-        "y": 802.74609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1040.0398559570312,\r
+        "y": 838.3127593994141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "782120ce.0449f",\r
+        "id": "34bde7e7.01eac8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 958.5001220703125,\r
-        "y": 914.2864990234375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1061.0667724609375,\r
+        "y": 949.8531646728516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c89cb66b.dc0d2",\r
-                "154e7688.b29339",\r
-                "4f1a8be1.b37344",\r
-                "2cdce288.c30c46",\r
-                "287cbb25.9abd94"\r
+                "7334f4ec.cbdcec",\r
+                "a07b9575.5fb718",\r
+                "78ed6398.2c281c",\r
+                "a81521ff.85b448",\r
+                "f61d745e.897b28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c89cb66b.dc0d2",\r
+        "id": "7334f4ec.cbdcec",\r
         "type": "set",\r
         "name": "set otn-oof.link-name and etc.",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 1205.0001220703125,\r
-        "y": 807.2864990234375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1307.5667724609375,\r
+        "y": 842.8531646728516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b7d4d2f2.ad66",\r
+        "id": "33dac520.fd9612",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 811.0002555847168,\r
-        "y": 295.741455078125,\r
-        "z": "740154b1.db9c44",\r
+        "x": 913.5669059753418,\r
+        "y": 331.30812072753906,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3e6ce739.eeb648",\r
+        "id": "34c3e8c4.75c3c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 620.9688835144043,\r
-        "y": 681.7416372299194,\r
-        "z": "740154b1.db9c44",\r
+        "x": 723.5355339050293,\r
+        "y": 717.3083028793335,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "b642d1e9.ee8bf8",\r
-                "d800f8fa.097b28",\r
-                "3eb232d2.31d3ce",\r
-                "7d4b4351.930cbc"\r
+                "66a1cd55.f26304",\r
+                "10360917.9b8077",\r
+                "9aea1ae3.78f458",\r
+                "949527f9.d2ae5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9e5ba4.2ed1f48",\r
+        "id": "4f42b7a6.ec3be8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2372.4998779296875,\r
-        "y": 1240,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2475.0665283203125,\r
+        "y": 1275.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "287cbb25.9abd94",\r
+        "id": "f61d745e.897b28",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1171.5001220703125,\r
-        "y": 996,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1274.0667724609375,\r
+        "y": 1031.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "55e25897.4f1fe8",\r
-                "1809a4d6.ba2673"\r
+                "edcf8a17.3c1388",\r
+                "21981b27.dc0a0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed734d7c.04c2f8",\r
+        "id": "d41411aa.2fbe08",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2696.9998779296875,\r
-        "y": 731,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2799.5665283203125,\r
+        "y": 766.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "d4861d1.90a2f6"\r
+                "1b874a77.cb23d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "551be9a2.28b98",\r
+        "id": "ec1c7dff.7ed9c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2730,\r
-        "y": 789,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2832.566650390625,\r
+        "y": 824.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "bc9d63b9.95524"\r
+                "6a0b9275.25af84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22092f51.833d9",\r
+        "id": "593d14b8.4d3af4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2733,\r
-        "y": 841,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2835.566650390625,\r
+        "y": 876.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "757b2f22.e7f98"\r
+                "7711b881.aaafb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc9d63b9.95524",\r
+        "id": "6a0b9275.25af84",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2915,\r
-        "y": 793,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3017.566650390625,\r
+        "y": 828.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "757b2f22.e7f98",\r
+        "id": "7711b881.aaafb8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2903,\r
-        "y": 844,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3005.566650390625,\r
+        "y": 879.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1391535e.6e46bd",\r
+        "id": "c385141d.3475d8",\r
         "type": "set",\r
         "name": "set domain A node ttp-id",\r
         "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",\r
         "comments": "",\r
-        "x": 4033.4998779296875,\r
-        "y": 646,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4136.0665283203125,\r
+        "y": 681.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d1abf42.aacfc8",\r
+        "id": "8b31beaa.98c0f8",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4041.4998779296875,\r
-        "y": 698,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4144.0665283203125,\r
+        "y": 733.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "492ab725.abc14"\r
+                "d767d020.bad1e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "492ab725.abc14",\r
+        "id": "d767d020.bad1e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4247.9998779296875,\r
-        "y": 676,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4350.5665283203125,\r
+        "y": 711.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "ca00a5f6.d5b71"\r
+                "d5ff040e.d2f8b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe7961d1.c0f4e",\r
+        "id": "a5ba7946.9385e8",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3585.6683349609375,\r
-        "y": 724.4815063476562,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3688.2349853515625,\r
+        "y": 760.0481719970703,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "59e37319.f4bec4"\r
+                "325b8414.0a0f7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20453efe.bca822",\r
+        "id": "dd30a478.a8f71",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3048.3826904296875,\r
-        "y": 726.6597290039062,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3150.9493408203125,\r
+        "y": 762.2263946533203,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "f844ac94.89e1e"\r
+                "d8739293.dd811"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f844ac94.89e1e",\r
+        "id": "d8739293.dd811",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3300.3826904296875,\r
-        "y": 723.6597290039062,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3402.9493408203125,\r
+        "y": 759.2263946533203,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "fe7961d1.c0f4e"\r
+                "a5ba7946.9385e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59e37319.f4bec4",\r
+        "id": "325b8414.0a0f7c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3812.4998779296875,\r
-        "y": 713,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3915.0665283203125,\r
+        "y": 748.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "1391535e.6e46bd",\r
-                "2d1abf42.aacfc8",\r
-                "d4f97b75.15b158",\r
-                "12165a81.403f85",\r
-                "103b5c34.d77a7c"\r
+                "c385141d.3475d8",\r
+                "8b31beaa.98c0f8",\r
+                "9cb3666f.fe6288",\r
+                "cc03f562.203da8",\r
+                "b538ddb.0ac7ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55e25897.4f1fe8",\r
+        "id": "edcf8a17.3c1388",\r
         "type": "get-resource",\r
         "name": "get-resource dst tp",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2453.5,\r
-        "y": 1136,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2556.066650390625,\r
+        "y": 1171.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "49c1a7b6.6f99c",\r
-                "2b24743b.25895c",\r
-                "c683e8fa.16a0b"\r
+                "966cd988.263208",\r
+                "2f0ba896.1bff08",\r
+                "5512ef83.d0409"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49c1a7b6.6f99c",\r
+        "id": "966cd988.263208",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2675.9998779296875,\r
-        "y": 1278,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2778.5665283203125,\r
+        "y": 1313.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "ed45880a.b1c94"\r
+                "d01135ac.6fb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b24743b.25895c",\r
+        "id": "2f0ba896.1bff08",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2659.9998779296875,\r
-        "y": 1329,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2762.5665283203125,\r
+        "y": 1364.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "37c7eeb2.67c862"\r
+                "dc2d6a40.545b28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c683e8fa.16a0b",\r
+        "id": "5512ef83.d0409",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2662.9998779296875,\r
-        "y": 1381,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2765.5665283203125,\r
+        "y": 1416.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "78affe58.b6f08"\r
+                "f1dc200a.0079b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78affe58.b6f08",\r
+        "id": "f1dc200a.0079b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2832.9998779296875,\r
-        "y": 1384,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2935.5665283203125,\r
+        "y": 1419.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "37c7eeb2.67c862",\r
+        "id": "dc2d6a40.545b28",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2844.9998779296875,\r
-        "y": 1333,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2947.5665283203125,\r
+        "y": 1368.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "141988e8.b25ef7",\r
+        "id": "eda7d352.9073e",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3032.3826904296875,\r
-        "y": 1288.6597290039062,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3134.9493408203125,\r
+        "y": 1324.2263946533203,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "a370922d.726108"\r
+                "3127fdbc.48d8ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a370922d.726108",\r
+        "id": "3127fdbc.48d8ba",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3275.3826904296875,\r
-        "y": 1287.6597290039062,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3377.9493408203125,\r
+        "y": 1323.2263946533203,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "e6beb03b.67e37"\r
+                "1629bb11.b51185"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61d27ccc.5b8de4",\r
+        "id": "2bfd4c7b.7322cc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5041.4998779296875,\r
-        "y": 1089,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5144.0665283203125,\r
+        "y": 1124.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "6cde7588.a972a4",\r
-                "46f2ef05.7f74e8",\r
-                "36e1e931.d36586"\r
+                "83a9dba4.165df8",\r
+                "213b5817.319d6",\r
+                "eacf08ed.9b6908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6beb03b.67e37",\r
+        "id": "1629bb11.b51185",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3531.6683349609375,\r
-        "y": 1287.4815063476562,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3634.2349853515625,\r
+        "y": 1323.0481719970703,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "412a94c.16241ec"\r
+                "1697afc2.a7d658"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df39947.2e32868",\r
+        "id": "a4a4d9de.8b1e5",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4828.4998779296875,\r
-        "y": 1088,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4931.0665283203125,\r
+        "y": 1123.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "61d27ccc.5b8de4"\r
+                "2bfd4c7b.7322cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "412a94c.16241ec",\r
+        "id": "1697afc2.a7d658",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3831.4998779296875,\r
-        "y": 1285,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3934.0665283203125,\r
+        "y": 1320.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "58c1eb2d.4365dc",\r
-                "eafee68f.21777",\r
-                "3baf326d.94389e",\r
-                "7894f836.65f328",\r
-                "9b949993.6af3e"\r
+                "64565dd0.7224d4",\r
+                "60e5c227.98dd4c",\r
+                "aa1de99e.ebfdb8",\r
+                "1e08769.d5ce909",\r
+                "19848a3.1ad4df6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58c1eb2d.4365dc",\r
+        "id": "64565dd0.7224d4",\r
         "type": "set",\r
         "name": "set domain B node ttp-id",\r
         "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",\r
         "comments": "",\r
-        "x": 4073.4998779296875,\r
-        "y": 1239,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4176.0665283203125,\r
+        "y": 1274.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eafee68f.21777",\r
+        "id": "60e5c227.98dd4c",\r
         "type": "get-resource",\r
         "name": "get-resource dst TTP",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-B.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4063.4998779296875,\r
-        "y": 1290,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4166.0665283203125,\r
+        "y": 1325.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "135e1de8.ac41a2"\r
+                "1423a8aa.1e5bbf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "135e1de8.ac41a2",\r
+        "id": "1423a8aa.1e5bbf",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4250.9998779296875,\r
-        "y": 1288,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4353.5665283203125,\r
+        "y": 1323.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "e5e86a3d.a35168"\r
+                "fe536508.3d42a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cde7588.a972a4",\r
+        "id": "83a9dba4.165df8",\r
         "type": "set",\r
         "name": "set domain B network-id",\r
         "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",\r
         "comments": "",\r
-        "x": 5311.4998779296875,\r
-        "y": 1065,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5414.0665283203125,\r
+        "y": 1100.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46f2ef05.7f74e8",\r
+        "id": "213b5817.319d6",\r
         "type": "get-resource",\r
         "name": "get-resource dst network-resource",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5321.4998779296875,\r
-        "y": 1111,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5424.0665283203125,\r
+        "y": 1146.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "95269d9e.8f1978"\r
+                "93d4670b.467a7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95269d9e.8f1978",\r
+        "id": "93d4670b.467a7",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5536.9998779296875,\r
-        "y": 1102,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5639.5665283203125,\r
+        "y": 1137.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "d0d56062.e96878"\r
+                "3c1a17a3.7c5698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0d56062.e96878",\r
+        "id": "3c1a17a3.7c5698",\r
         "type": "set",\r
         "name": "set domain B network-id, topo-id, client-id, etc",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 5791.4998779296875,\r
-        "y": 1108,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5894.0665283203125,\r
+        "y": 1143.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d4861d1.90a2f6",\r
+        "id": "1b874a77.cb23d6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2830.9998779296875,\r
-        "y": 727,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2933.5665283203125,\r
+        "y": 762.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "20453efe.bca822"\r
+                "dd30a478.a8f71"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed45880a.b1c94",\r
+        "id": "d01135ac.6fb8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2821.9998779296875,\r
-        "y": 1269,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2924.5665283203125,\r
+        "y": 1304.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "141988e8.b25ef7"\r
+                "eda7d352.9073e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca00a5f6.d5b71",\r
+        "id": "d5ff040e.d2f8b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4422.9998779296875,\r
-        "y": 672,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4525.5665283203125,\r
+        "y": 707.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "4c98d169.bddc"\r
+                "7a85cdc9.21de74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5e86a3d.a35168",\r
+        "id": "fe536508.3d42a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4439.9998779296875,\r
-        "y": 1277,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4542.5665283203125,\r
+        "y": 1312.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "b92cc089.036dc8"\r
+                "7f789c56.73a404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1809a4d6.ba2673",\r
+        "id": "21981b27.dc0a0c",\r
         "type": "get-resource",\r
         "name": "get-resource src tp",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2499.5,\r
-        "y": 770,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2602.066650390625,\r
+        "y": 805.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "ed734d7c.04c2f8",\r
-                "551be9a2.28b98",\r
-                "22092f51.833d9"\r
+                "d41411aa.2fbe08",\r
+                "ec1c7dff.7ed9c",\r
+                "593d14b8.4d3af4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4f97b75.15b158",\r
+        "id": "9cb3666f.fe6288",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3902.9998779296875,\r
-        "y": 516,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4005.5665283203125,\r
+        "y": 551.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "27b2efea.3f735",\r
-                "abdc030.e780f",\r
-                "d67670c0.149af8"\r
+                "2d596f92.386da",\r
+                "b8bb35c7.68022",\r
+                "50dbd465.907d94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27b2efea.3f735",\r
+        "id": "2d596f92.386da",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4098.5,\r
-        "y": 468,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4201.066650390625,\r
+        "y": 503.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "67bcf691.cce0a8"\r
+                "7b9cb223.733344"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abdc030.e780f",\r
+        "id": "b8bb35c7.68022",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4090.5,\r
-        "y": 523,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4193.066650390625,\r
+        "y": 558.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "f2e24f2.12fadb"\r
+                "def9d226.6d2cf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d67670c0.149af8",\r
+        "id": "50dbd465.907d94",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4095.5,\r
-        "y": 580,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4198.066650390625,\r
+        "y": 615.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c3d2abbd.c8f708"\r
+                "7c7e6039.479ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3d2abbd.c8f708",\r
+        "id": "7c7e6039.479ca8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4247.5,\r
-        "y": 581,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4350.066650390625,\r
+        "y": 616.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2e24f2.12fadb",\r
+        "id": "def9d226.6d2cf8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4258.5,\r
-        "y": 526,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4361.066650390625,\r
+        "y": 561.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67bcf691.cce0a8",\r
+        "id": "7b9cb223.733344",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4242.88232421875,\r
-        "y": 465.6556701660156,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4345.448974609375,\r
+        "y": 501.2223358154297,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "304592d5.537a8e",\r
-                "2af9eb5e.d3c17c"\r
+                "726f1c43.81de24",\r
+                "6baa44bf.896aa4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "304592d5.537a8e",\r
+        "id": "726f1c43.81de24",\r
         "type": "set",\r
         "name": "set domain A node-id and tpn",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4467.9998779296875,\r
-        "y": 421,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4570.5665283203125,\r
+        "y": 456.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12165a81.403f85",\r
+        "id": "cc03f562.203da8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3989.9998779296875,\r
-        "y": 763,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4092.5665283203125,\r
+        "y": 798.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4c98d169.bddc",\r
+        "id": "7a85cdc9.21de74",\r
         "type": "set",\r
         "name": "set domain A tunnel tp ip",\r
         "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",\r
         "comments": "",\r
-        "x": 4683.9998779296875,\r
-        "y": 669,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4786.5665283203125,\r
+        "y": 704.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7894f836.65f328",\r
+        "id": "1e08769.d5ce909",\r
         "type": "get-resource",\r
         "name": "get-resource dst pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3899.9998779296875,\r
-        "y": 1119,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4002.5665283203125,\r
+        "y": 1154.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "54998b27.2003cc",\r
-                "d1cd027c.1f10b8",\r
-                "75ff3dee.3bf8bc"\r
+                "1a2b49d5.b5a17e",\r
+                "7bc68f65.9bf008",\r
+                "aa0e1591.186978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75ff3dee.3bf8bc",\r
+        "id": "aa0e1591.186978",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4095.5,\r
-        "y": 1071,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4198.066650390625,\r
+        "y": 1106.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c056b35b.56583"\r
+                "d1b079c.9297d08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1cd027c.1f10b8",\r
+        "id": "7bc68f65.9bf008",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4087.5,\r
-        "y": 1126,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4190.066650390625,\r
+        "y": 1161.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "560adcd5.77c02c"\r
+                "2daddcb3.194964"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54998b27.2003cc",\r
+        "id": "1a2b49d5.b5a17e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4092.5,\r
-        "y": 1183,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4195.066650390625,\r
+        "y": 1218.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "3b1e11f8.04c5b6"\r
+                "ec80c220.eda94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c056b35b.56583",\r
+        "id": "d1b079c.9297d08",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4239.88232421875,\r
-        "y": 1068.6556701660156,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4342.448974609375,\r
+        "y": 1104.2223358154297,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "7ca2f810.f9ca5",\r
-                "5d0e55ed.7c2c54"\r
+                "86d91eb8.1d4188",\r
+                "ccc8b0e3.aa30a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "560adcd5.77c02c",\r
+        "id": "2daddcb3.194964",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4255.5,\r
-        "y": 1129,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4358.066650390625,\r
+        "y": 1164.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3b1e11f8.04c5b6",\r
+        "id": "ec80c220.eda94",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4244.5,\r
-        "y": 1184,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4347.066650390625,\r
+        "y": 1219.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7ca2f810.f9ca5",\r
+        "id": "86d91eb8.1d4188",\r
         "type": "set",\r
         "name": "set domain B node-id and tpn",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4448.9998779296875,\r
-        "y": 1036,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4551.5665283203125,\r
+        "y": 1071.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3baf326d.94389e",\r
+        "id": "aa1de99e.ebfdb8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4018.9998779296875,\r
-        "y": 1331,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4121.5665283203125,\r
+        "y": 1366.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b92cc089.036dc8",\r
+        "id": "7f789c56.73a404",\r
         "type": "set",\r
         "name": "set domain B tunnel tp id",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4672.9998779296875,\r
-        "y": 1276,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4775.5665283203125,\r
+        "y": 1311.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8548322.1dce7",\r
+        "id": "4af47e1.d24b48",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4824.9998779296875,\r
-        "y": 484,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4927.5665283203125,\r
+        "y": 519.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "49aa1e98.21619"\r
+                "4f3cf505.2fca3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49aa1e98.21619",\r
+        "id": "4f3cf505.2fca3c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5001.9998779296875,\r
-        "y": 476,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5104.5665283203125,\r
+        "y": 511.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "13542cdd.43dda3",\r
-                "909a99fa.787ae8",\r
-                "44fc9502.8d863c"\r
+                "3a45344a.82c99c",\r
+                "6a555c5c.0d6d94",\r
+                "bc9971ad.98e16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13542cdd.43dda3",\r
+        "id": "3a45344a.82c99c",\r
         "type": "set",\r
         "name": "set domain A network-id",\r
         "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",\r
         "comments": "",\r
-        "x": 5216.9998779296875,\r
-        "y": 457,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5319.5665283203125,\r
+        "y": 492.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "909a99fa.787ae8",\r
+        "id": "6a555c5c.0d6d94",\r
         "type": "get-resource",\r
         "name": "get-resource src network-resource",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5233.9998779296875,\r
-        "y": 521,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5336.5665283203125,\r
+        "y": 556.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "30bbae6f.18af4a"\r
+                "12908a50.109196"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30bbae6f.18af4a",\r
+        "id": "12908a50.109196",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5457.4998779296875,\r
-        "y": 522,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5560.0665283203125,\r
+        "y": 557.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "a367788a.bb68e"\r
+                "d7f6c969.bf14a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a367788a.bb68e",\r
+        "id": "d7f6c969.bf14a8",\r
         "type": "set",\r
         "name": "set domain A network-id, topo-id, client-id, etc",\r
         "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",\r
         "comments": "",\r
-        "x": 5721.9998779296875,\r
-        "y": 511,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5824.5665283203125,\r
+        "y": 546.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2af9eb5e.d3c17c",\r
+        "id": "6baa44bf.896aa4",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4426.9998779296875,\r
-        "y": 480,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4529.5665283203125,\r
+        "y": 515.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "df80ec0f.2a1388"\r
+                "c5bce932.312ae8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df80ec0f.2a1388",\r
+        "id": "c5bce932.312ae8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4621.9998779296875,\r
-        "y": 480,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4724.5665283203125,\r
+        "y": 515.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c8548322.1dce7"\r
+                "4af47e1.d24b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44fc9502.8d863c",\r
+        "id": "bc9971ad.98e16",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 5160.9998779296875,\r
-        "y": 574,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5263.5665283203125,\r
+        "y": 609.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d0e55ed.7c2c54",\r
+        "id": "ccc8b0e3.aa30a",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4427.9998779296875,\r
-        "y": 1087,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4530.5665283203125,\r
+        "y": 1122.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "97742823.a37f08"\r
+                "2505107d.3aa54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "97742823.a37f08",\r
+        "id": "2505107d.3aa54",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4622.9998779296875,\r
-        "y": 1087,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4725.5665283203125,\r
+        "y": 1122.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "df39947.2e32868"\r
+                "a4a4d9de.8b1e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36e1e931.d36586",\r
+        "id": "eacf08ed.9b6908",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 5246.9998779296875,\r
-        "y": 1167,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5349.5665283203125,\r
+        "y": 1202.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "103b5c34.d77a7c",\r
+        "id": "b538ddb.0ac7ba",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<!--<parameter name=\"original_string\" value='`$tmp.aai.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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3930.9998779296875,\r
-        "y": 310,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4033.5665283203125,\r
+        "y": 345.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "b3bf59d4.5b493",\r
-                "21c8620c.a1786e"\r
+                "e05ff3f0.c79818",\r
+                "bfafe917.9e0828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21c8620c.a1786e",\r
+        "id": "bfafe917.9e0828",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4151.9998779296875,\r
-        "y": 278,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4254.5665283203125,\r
+        "y": 313.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "ac6a8696.ec08c8"\r
+                "984c7f99.dba1f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3bf59d4.5b493",\r
+        "id": "e05ff3f0.c79818",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4151.9998779296875,\r
-        "y": 325,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4254.5665283203125,\r
+        "y": 360.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "53c1b9f8.feb02"\r
+                "ab85b68d.00fab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac6a8696.ec08c8",\r
+        "id": "984c7f99.dba1f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4316.9998779296875,\r
-        "y": 275,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4419.5665283203125,\r
+        "y": 310.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c3a92ffe.308538"\r
+                "1167b845.d3eb88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3a92ffe.308538",\r
+        "id": "1167b845.d3eb88",\r
         "type": "set",\r
         "name": "set domain-A.ltpId",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4498.9998779296875,\r
-        "y": 279,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4601.5665283203125,\r
+        "y": 314.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "53c1b9f8.feb02",\r
+        "id": "ab85b68d.00fab8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 4318.9998779296875,\r
-        "y": 325,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4421.5665283203125,\r
+        "y": 360.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b949993.6af3e",\r
+        "id": "19848a3.1ad4df6",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3938.9998779296875,\r
-        "y": 934,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4041.5665283203125,\r
+        "y": 969.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "63b15b9d.d0246c",\r
-                "438781d9.fa013"\r
+                "bcadf20f.09707",\r
+                "f49b197.760f268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "438781d9.fa013",\r
+        "id": "f49b197.760f268",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4159.9998779296875,\r
-        "y": 902,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4262.5665283203125,\r
+        "y": 937.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "7c480aff.2bda14"\r
+                "7a4a14cb.2c7cc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63b15b9d.d0246c",\r
+        "id": "bcadf20f.09707",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4159.9998779296875,\r
-        "y": 949,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4262.5665283203125,\r
+        "y": 984.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "6669851b.858ebc"\r
+                "f8a2353e.30053"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c480aff.2bda14",\r
+        "id": "7a4a14cb.2c7cc4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4324.9998779296875,\r
-        "y": 899,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4427.5665283203125,\r
+        "y": 934.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "6535be11.5e3bd"\r
+                "c7ad40e1.18d2e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6535be11.5e3bd",\r
+        "id": "c7ad40e1.18d2e8",\r
         "type": "set",\r
         "name": "set domain-B.ltpId",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4520.9998779296875,\r
-        "y": 896,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4623.5665283203125,\r
+        "y": 931.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6669851b.858ebc",\r
+        "id": "f8a2353e.30053",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 4326.9998779296875,\r
-        "y": 949,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4429.5665283203125,\r
+        "y": 984.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "154e7688.b29339",\r
+        "id": "a07b9575.5fb718",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "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='' />-->",\r
         "comments": "",\r
-        "x": 1196,\r
-        "y": 736,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1298.566650390625,\r
+        "y": 771.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f2860ab.d20368",\r
+        "id": "49f4a3da.f830dc",\r
         "type": "comment",\r
         "name": "Not useful anymore",\r
         "info": "this domain-A.ltpId is not used anymore",\r
         "comments": "",\r
-        "x": 4541.9998779296875,\r
-        "y": 255,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4644.5665283203125,\r
+        "y": 290.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "839b6b92.78af58",\r
+        "id": "6c8ca0d9.ae8db8",\r
         "type": "comment",\r
         "name": "Not useful anymore",\r
         "info": "this domain-B.ltpId is not used anymore",\r
         "comments": "",\r
-        "x": 4563.9998779296875,\r
-        "y": 868,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4666.5665283203125,\r
+        "y": 903.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d800f8fa.097b28",\r
+        "id": "10360917.9b8077",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<!--<parameter name='`tmp.otninfo_length`' value='0' />-->\n<parameter name='`tmp.otninfoProtect.`' value='' />",\r
         "comments": "",\r
-        "x": 837,\r
-        "y": 664,\r
-        "z": "740154b1.db9c44",\r
+        "x": 939.566650390625,\r
+        "y": 699.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9d59de38.f2a96",\r
+        "id": "197c2e5d.40b5c2",\r
         "type": "comment",\r
         "name": "May not be necessary",\r
         "info": "",\r
         "comments": "",\r
-        "x": 848,\r
-        "y": 617,\r
-        "z": "740154b1.db9c44",\r
+        "x": 950.566650390625,\r
+        "y": 652.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3eb232d2.31d3ce",\r
+        "id": "9aea1ae3.78f458",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 828,\r
-        "y": 414,\r
-        "z": "740154b1.db9c44",\r
+        "x": 930.566650390625,\r
+        "y": 449.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "ef757a3b.136af8",\r
-                "170891d6.65d54e",\r
-                "69ba386e.9da968",\r
-                "2e082ac1.a1ccfe",\r
-                "a74fb526.bc5db",\r
-                "4af9732c.943804",\r
-                "45b96535.5a3dac",\r
-                "1033844e.1fe0b4",\r
-                "644a4209.4c190c",\r
-                "752e7b91.ad42a4",\r
-                "7d6aaca7.ab1b4c",\r
-                "441d97dd.ea8d",\r
-                "75c12230.00ef3c"\r
+                "8d20e71f.73ff3",\r
+                "a7d23344.01d178",\r
+                "bdabda22.abbcf",\r
+                "2d95a78.15b9dd8",\r
+                "fa4a5e3a.f8a4e8",\r
+                "1732667e.72f262",\r
+                "2d0258cc.74942",\r
+                "52bfffd9.b2be3",\r
+                "9fbe4c7e.064f2",\r
+                "272b0d1.5ea4172",\r
+                "c5b8562e.825c2",\r
+                "f2fd0ea2.f13608",\r
+                "5207916.8d843f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "874f6992.1d0f",\r
+        "id": "b34bb5ff.c918e",\r
         "type": "execute",\r
         "name": "execute PCE in ccsdk/sli/core",\r
         "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`\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1650,\r
-        "y": 661,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1752.566650390625,\r
+        "y": 696.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "9cd26432.6ca2e",\r
-                "d020471b.87351",\r
-                "d9ad3259.cc415"\r
+                "d8269b88.a628f",\r
+                "bd71ad8b.09afd",\r
+                "ab86e983.081cb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef757a3b.136af8",\r
+        "id": "8d20e71f.73ff3",\r
         "type": "record",\r
         "name": "record tmp.pce-src and dst node and backup",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<!--<parameter name=\"field1\" value=\"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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1124,\r
-        "y": 447,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1226.566650390625,\r
+        "y": 482.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9cd26432.6ca2e",\r
+        "id": "d8269b88.a628f",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1895,\r
-        "y": 693,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1997.566650390625,\r
+        "y": 728.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d020471b.87351",\r
+        "id": "bd71ad8b.09afd",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1902,\r
-        "y": 735,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2004.566650390625,\r
+        "y": 770.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d9ad3259.cc415",\r
+        "id": "ab86e983.081cb",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1897,\r
-        "y": 656,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1999.566650390625,\r
+        "y": 691.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "170891d6.65d54e",\r
+        "id": "a7d23344.01d178",\r
         "type": "set",\r
         "name": "set tmp.pce-src-node",\r
         "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",\r
         "comments": "",\r
-        "x": 1045,\r
-        "y": 319,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1147.566650390625,\r
+        "y": 354.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "69ba386e.9da968",\r
+        "id": "bdabda22.abbcf",\r
         "type": "set",\r
         "name": "set tmp.pce-dst-node",\r
         "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]`\" />",\r
         "comments": "",\r
-        "x": 1045,\r
-        "y": 359,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1147.566650390625,\r
+        "y": 394.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f1a8be1.b37344",\r
+        "id": "78ed6398.2c281c",\r
         "type": "set",\r
         "name": "set src-ltpId",\r
         "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",\r
         "comments": "",\r
-        "x": 1178,\r
-        "y": 867,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1280.566650390625,\r
+        "y": 902.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2cdce288.c30c46",\r
+        "id": "a81521ff.85b448",\r
         "type": "set",\r
         "name": "set dst-ltpId",\r
         "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",\r
         "comments": "",\r
-        "x": 1179,\r
-        "y": 917,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1281.566650390625,\r
+        "y": 952.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2e082ac1.a1ccfe",\r
+        "id": "2d95a78.15b9dd8",\r
         "type": "get-resource",\r
         "name": "get-resource network-resources-list",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1102,\r
-        "y": 43,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1204.566650390625,\r
+        "y": 78.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "8367b97c.7cba2",\r
-                "c705fa11.095f6",\r
-                "3e5ba73a.cfbd2"\r
+                "85160fe1.7646a8",\r
+                "5cf07174.f97d5",\r
+                "95dd25f4.16dd98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c705fa11.095f6",\r
+        "id": "5cf07174.f97d5",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1335,\r
-        "y": 67,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1437.566650390625,\r
+        "y": 102.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3e5ba73a.cfbd2",\r
+        "id": "95dd25f4.16dd98",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1349,\r
-        "y": 107,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1451.566650390625,\r
+        "y": 142.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8367b97c.7cba2",\r
+        "id": "85160fe1.7646a8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1338,\r
-        "y": 26,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1440.566650390625,\r
+        "y": 61.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a74fb526.bc5db",\r
+        "id": "fa4a5e3a.f8a4e8",\r
         "type": "for",\r
         "name": "for netwidx..allNetworksList_length",\r
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1094,\r
-        "y": 89,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1196.566650390625,\r
+        "y": 124.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "e64f1c2c.75e2a8"\r
+                "a46c1b09.222d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e64f1c2c.75e2a8",\r
+        "id": "a46c1b09.222d88",\r
         "type": "switchNode",\r
         "name": "switch provider-id domainA",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1415,\r
-        "y": 165,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1517.566650390625,\r
+        "y": 200.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "6f7c355b.5a1c94",\r
-                "49d801ae.f158f"\r
+                "d01d8d32.ec5d38",\r
+                "81f4ca42.44c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f7c355b.5a1c94",\r
+        "id": "d01d8d32.ec5d38",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1639,\r
-        "y": 227,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1741.566650390625,\r
+        "y": 262.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "14708434.e61bac"\r
+                "87874c93.14d4c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14708434.e61bac",\r
+        "id": "87874c93.14d4c8",\r
         "type": "switchNode",\r
         "name": "switch te-topo-id",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1852,\r
-        "y": 227,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1954.566650390625,\r
+        "y": 262.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "4944f354.0e26f4"\r
+                "1f97427e.3bd1ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4944f354.0e26f4",\r
+        "id": "1f97427e.3bd1ce",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2017,\r
-        "y": 227,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2119.566650390625,\r
+        "y": 262.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "3ffd16fe.ae9d82"\r
+                "e1187fc2.b7873"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ffd16fe.ae9d82",\r
+        "id": "e1187fc2.b7873",\r
         "type": "set",\r
         "name": "set otnTopoIdSrc",\r
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
-        "x": 2186,\r
-        "y": 227,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2288.566650390625,\r
+        "y": 262.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49d801ae.f158f",\r
+        "id": "81f4ca42.44c8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1639,\r
-        "y": 280,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1741.566650390625,\r
+        "y": 315.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "88e310ce.d70d1"\r
+                "c4d51181.d481d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88e310ce.d70d1",\r
+        "id": "c4d51181.d481d",\r
         "type": "switchNode",\r
         "name": "switch provider-id domainB",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainB-pnfName[2]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1827,\r
-        "y": 280,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1929.566650390625,\r
+        "y": 315.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "58122a1d.8684e4",\r
-                "3cb3eb19.e7f8b4"\r
+                "1eb6a395.543214",\r
+                "aff2e998.39f418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58122a1d.8684e4",\r
+        "id": "1eb6a395.543214",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2017,\r
-        "y": 280,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2119.566650390625,\r
+        "y": 315.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "5772e567.b80a34"\r
+                "131fed58.61933b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5772e567.b80a34",\r
+        "id": "131fed58.61933b",\r
         "type": "switchNode",\r
         "name": "switch te-topo-id",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainB-pnfName[6]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2185,\r
-        "y": 280,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2287.566650390625,\r
+        "y": 315.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "2fb8eaf6.956b36"\r
+                "beb59651.122648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2fb8eaf6.956b36",\r
+        "id": "beb59651.122648",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2341,\r
-        "y": 280,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2443.566650390625,\r
+        "y": 315.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "821af63c.9d499"\r
+                "27e9a268.b581ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d7e803.580f08",\r
+        "id": "fe5f3417.d45418",\r
         "type": "set",\r
         "name": "set otnTopoIdDst",\r
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
-        "x": 3036,\r
-        "y": 184,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3138.566650390625,\r
+        "y": 219.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4af9732c.943804",\r
+        "id": "1732667e.72f262",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "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' />-->",\r
         "comments": "",\r
-        "x": 1039,\r
-        "y": 260,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1141.566650390625,\r
+        "y": 295.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45b96535.5a3dac",\r
+        "id": "2d0258cc.74942",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
         "comments": "",\r
-        "x": 1048,\r
-        "y": 142,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1150.566650390625,\r
+        "y": 177.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1033844e.1fe0b4",\r
+        "id": "52bfffd9.b2be3",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='tmp.pce-dst-node.' value='' />\n",\r
         "comments": "",\r
-        "x": 1046,\r
-        "y": 184,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1148.566650390625,\r
+        "y": 219.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "644a4209.4c190c",\r
+        "id": "9fbe4c7e.064f2",\r
         "type": "record",\r
         "name": "record otn-oof.",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$otn-oof.`\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1035,\r
-        "y": 495,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1137.566650390625,\r
+        "y": 530.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d9004337.b1e7",\r
+        "id": "6130a3db.8f4a2c",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1057,\r
-        "y": 568,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1159.566650390625,\r
+        "y": 603.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "752e7b91.ad42a4",\r
+        "id": "272b0d1.5ea4172",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='filenamemm' value=\"`$tmp.pce-src-node + $tmp.pce-dst-node + $tmp.pce-dst-node-backup`\" />",\r
         "comments": "",\r
-        "x": 1031,\r
-        "y": 531,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1133.566650390625,\r
+        "y": 566.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3cb3eb19.e7f8b4",\r
+        "id": "aff2e998.39f418",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2007,\r
-        "y": 344,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2109.566650390625,\r
+        "y": 379.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "b16334e2.e8d148"\r
+                "45368237.09cbd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b16334e2.e8d148",\r
+        "id": "45368237.09cbd4",\r
         "type": "switchNode",\r
         "name": "switch provider-id domainC",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainC-pnfName[2]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2208,\r
-        "y": 345,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2310.566650390625,\r
+        "y": 380.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "7d3fd43.e41d5ac"\r
+                "60978bb2.ce9a04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d3fd43.e41d5ac",\r
+        "id": "60978bb2.ce9a04",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2418,\r
-        "y": 345,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2520.566650390625,\r
+        "y": 380.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "dccf569f.2f16c"\r
+                "cc22664a.751d9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e56fd0ad.9e01a8",\r
+        "id": "2b3da5c.c5bcc5a",\r
         "type": "set",\r
         "name": "set otnTopoIdDstBackup",\r
         "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
-        "x": 3126,\r
-        "y": 435.0000305175781,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3228.566650390625,\r
+        "y": 470.5666961669922,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7d6aaca7.ab1b4c",\r
+        "id": "c5b8562e.825c2",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='tmp.pce-dst-node-backup.' value='' />\n",\r
         "comments": "",\r
-        "x": 1044,\r
-        "y": 222,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1146.566650390625,\r
+        "y": 257.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "441d97dd.ea8d",\r
+        "id": "f2fd0ea2.f13608",\r
         "type": "set",\r
         "name": "set tmp.pce-dst-node-backup",\r
         "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]`\" />",\r
         "comments": "",\r
-        "x": 1076,\r
-        "y": 400,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1178.566650390625,\r
+        "y": 435.56666564941406,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "75c12230.00ef3c",\r
+        "id": "5207916.8d843f",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1080,\r
-        "y": 647,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1182.566650390625,\r
+        "y": 682.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "bdfc5f0.5322ba",\r
-                "89aa82c1.c2aec8"\r
+                "9d24bff4.f7fc3",\r
+                "53b4e0bd.3986c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdfc5f0.5322ba",\r
+        "id": "9d24bff4.f7fc3",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1271,\r
-        "y": 651,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1373.566650390625,\r
+        "y": 686.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "ae417966.2eaf28"\r
+                "c8813a5.7f98b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae417966.2eaf28",\r
+        "id": "c8813a5.7f98b48",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1398,\r
-        "y": 650,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1500.566650390625,\r
+        "y": 685.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "874f6992.1d0f"\r
+                "b34bb5ff.c918e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89aa82c1.c2aec8",\r
+        "id": "53b4e0bd.3986c8",\r
         "type": "outcomeTrue",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1273,\r
-        "y": 604,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1375.566650390625,\r
+        "y": 639.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "50eccb47.89161c"\r
+                "758c479c.bf4b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50eccb47.89161c",\r
+        "id": "758c479c.bf4b8",\r
         "type": "execute",\r
         "name": "execute PCE in ccsdk/sli/core",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1647,\r
-        "y": 534,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1749.566650390625,\r
+        "y": 569.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "e3a2c563.0a869",\r
-                "2d6f2f7c.332048",\r
-                "b9b4d723.6c8fd"\r
+                "b6552b0f.7b51e8",\r
+                "e27e8a21.4f0d3",\r
+                "b3bc4161.bbb128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3a2c563.0a869",\r
+        "id": "b6552b0f.7b51e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1892,\r
-        "y": 566,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1994.566650390625,\r
+        "y": 601.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2d6f2f7c.332048",\r
+        "id": "e27e8a21.4f0d3",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1899,\r
-        "y": 608,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2001.566650390625,\r
+        "y": 643.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b9b4d723.6c8fd",\r
+        "id": "b3bc4161.bbb128",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1894,\r
-        "y": 529,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1996.566650390625,\r
+        "y": 564.5666656494141,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e1473f30.10032",\r
+        "id": "c19998ca.837848",\r
         "type": "for",\r
         "name": "for vidx..otn-oof.secondarySolutions_length[]",\r
         "xml": "<for index='vidx' start='0' end='`$otn-oof.secondarySolutions_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 845,\r
-        "y": 2065,\r
-        "z": "740154b1.db9c44",\r
+        "x": 947.566650390625,\r
+        "y": 2100.566665649414,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c89ad3b7.0e216"\r
+                "decd0bab.6330f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c89ad3b7.0e216",\r
+        "id": "decd0bab.6330f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 949.5272216796875,\r
-        "y": 2256.040771484375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1052.0938720703125,\r
+        "y": 2291.607437133789,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "80fa0c9d.1054f",\r
-                "9a5ac465.6157d8",\r
-                "8065227b.cd4a2",\r
-                "b1aba60b.7f9e6",\r
-                "deccca97.268a9"\r
+                "81b9ae35.358fd",\r
+                "74f1c10d.f5627",\r
+                "64fb9896.7c1ac8",\r
+                "74b04e90.089e28",\r
+                "d162f07e.eec04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80fa0c9d.1054f",\r
+        "id": "81b9ae35.358fd",\r
         "type": "set",\r
         "name": "set otn-oof.link-name and etc.",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 1196.0272216796875,\r
-        "y": 2149.040771484375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1298.5938720703125,\r
+        "y": 2184.607437133789,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "deccca97.268a9",\r
+        "id": "d162f07e.eec04",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1162.5272216796875,\r
-        "y": 2337.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1265.0938720703125,\r
+        "y": 2373.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "e3c2dcef.aae8f8",\r
-                "55fb0c7e.571584"\r
+                "9a15bd2c.c28818",\r
+                "85fd58d.daa8628"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a5ac465.6157d8",\r
+        "id": "74f1c10d.f5627",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "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",\r
         "comments": "",\r
-        "x": 1187.027099609375,\r
-        "y": 2077.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1289.59375,\r
+        "y": 2113.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8065227b.cd4a2",\r
+        "id": "64fb9896.7c1ac8",\r
         "type": "set",\r
         "name": "set src-ltpId",\r
         "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",\r
         "comments": "",\r
-        "x": 1169.027099609375,\r
-        "y": 2208.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1271.59375,\r
+        "y": 2244.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1aba60b.7f9e6",\r
+        "id": "74b04e90.089e28",\r
         "type": "set",\r
         "name": "set dst-ltpId",\r
         "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",\r
         "comments": "",\r
-        "x": 1170.027099609375,\r
-        "y": 2258.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1272.59375,\r
+        "y": 2294.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e12f41a.3aad64",\r
+        "id": "46c3f571.5e6ab4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2688.0269775390625,\r
-        "y": 2072.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2790.5936279296875,\r
+        "y": 2108.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "5b6bf151.2d756"\r
+                "190fafd3.9d5618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5b16aa9.5e894",\r
+        "id": "1af50a9f.ba08f5",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2721.027099609375,\r
-        "y": 2130.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2823.59375,\r
+        "y": 2166.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "a9d16a27.d5676"\r
+                "eb6a21e7.d2544"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a01d696.8c8118",\r
+        "id": "9ac3f118.22cc9",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2724.027099609375,\r
-        "y": 2182.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2826.59375,\r
+        "y": 2218.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c1a7727e.a603d8"\r
+                "5df935cf.d90ef4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9d16a27.d5676",\r
+        "id": "eb6a21e7.d2544",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2906.027099609375,\r
-        "y": 2134.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3008.59375,\r
+        "y": 2170.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1a7727e.a603d8",\r
+        "id": "5df935cf.d90ef4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2894.027099609375,\r
-        "y": 2185.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2996.59375,\r
+        "y": 2221.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40a1b2c.bbb3c4c",\r
+        "id": "76d93361.427b24",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3039.4097900390625,\r
-        "y": 2068.4140014648438,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3141.9764404296875,\r
+        "y": 2103.980667114258,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "64ce1fe.fe36ee"\r
+                "3f5fbc68.02a224"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64ce1fe.fe36ee",\r
+        "id": "3f5fbc68.02a224",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3291.4097900390625,\r
-        "y": 2065.4140014648438,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3393.9764404296875,\r
+        "y": 2100.980667114258,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "7222973f.63de28"\r
+                "ba2b4720.d65cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b6bf151.2d756",\r
+        "id": "190fafd3.9d5618",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2822.0269775390625,\r
-        "y": 2068.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2924.5936279296875,\r
+        "y": 2104.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "40a1b2c.bbb3c4c"\r
+                "76d93361.427b24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55fb0c7e.571584",\r
+        "id": "85fd58d.daa8628",\r
         "type": "get-resource",\r
         "name": "get-resource src tp",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2490.527099609375,\r
-        "y": 2111.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2593.09375,\r
+        "y": 2147.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "6e12f41a.3aad64",\r
-                "b5b16aa9.5e894",\r
-                "4a01d696.8c8118"\r
+                "46c3f571.5e6ab4",\r
+                "1af50a9f.ba08f5",\r
+                "9ac3f118.22cc9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "961bb541.fa238",\r
+        "id": "17b12d07.01db03",\r
         "type": "set",\r
         "name": "set domain A node ttp-id",\r
         "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",\r
         "comments": "",\r
-        "x": 4024.5269775390625,\r
-        "y": 1987.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4127.0936279296875,\r
+        "y": 2023.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c9ed8f.1f298a7",\r
+        "id": "56dc3866.a81c4",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4032.5269775390625,\r
-        "y": 2039.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4135.0936279296875,\r
+        "y": 2075.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c8884a5e.cff248"\r
+                "bd3f106f.63b0f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8884a5e.cff248",\r
+        "id": "bd3f106f.63b0f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4239.0269775390625,\r
-        "y": 2017.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4341.5936279296875,\r
+        "y": 2053.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "ca161250.2600b"\r
+                "e873d0c7.864da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7222973f.63de28",\r
+        "id": "ba2b4720.d65cf",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3576.6954345703125,\r
-        "y": 2066.2357788085938,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3679.2620849609375,\r
+        "y": 2101.802444458008,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "9a193d4a.e0dcc8"\r
+                "53671013.434608"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a193d4a.e0dcc8",\r
+        "id": "53671013.434608",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3803.5269775390625,\r
-        "y": 2054.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3906.0936279296875,\r
+        "y": 2090.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "961bb541.fa238",\r
-                "1c9ed8f.1f298a7",\r
-                "8d06a9c9.1b85a",\r
-                "63176143.c85c48",\r
-                "cef3ca9d.2c104"\r
+                "17b12d07.01db03",\r
+                "56dc3866.a81c4",\r
+                "c0980ef4.f86658",\r
+                "1febeafa.37d915",\r
+                "ab68a575.dbe428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca161250.2600b",\r
+        "id": "e873d0c7.864da",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4414.0269775390625,\r
-        "y": 2013.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4516.5936279296875,\r
+        "y": 2049.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "258887d0.26df98"\r
+                "42a0b5ef.0a3e6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d06a9c9.1b85a",\r
+        "id": "c0980ef4.f86658",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3894.0269775390625,\r
-        "y": 1857.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3996.5936279296875,\r
+        "y": 1893.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "9a5fd1c3.7d763",\r
-                "e3871f94.a28688",\r
-                "67939630.c5f78"\r
+                "fabc0bd7.062ae",\r
+                "cfe003ed.a587d",\r
+                "45d38fe1.3add68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a5fd1c3.7d763",\r
+        "id": "fabc0bd7.062ae",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4089.527099609375,\r
-        "y": 1809.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4192.09375,\r
+        "y": 1845.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "7fb21e6a.21f63"\r
+                "c6a1c641.2a058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3871f94.a28688",\r
+        "id": "cfe003ed.a587d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4081.527099609375,\r
-        "y": 1864.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4184.09375,\r
+        "y": 1900.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "3c75373d.b0767"\r
+                "1b4dfe50.a881e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67939630.c5f78",\r
+        "id": "45d38fe1.3add68",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4086.527099609375,\r
-        "y": 1921.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4189.09375,\r
+        "y": 1957.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "8ad73c5e.3d1f"\r
+                "6ffbe3ea.ec634c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ad73c5e.3d1f",\r
+        "id": "6ffbe3ea.ec634c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4238.527099609375,\r
-        "y": 1922.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4341.09375,\r
+        "y": 1958.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3c75373d.b0767",\r
+        "id": "1b4dfe50.a881e2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4249.527099609375,\r
-        "y": 1867.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4352.09375,\r
+        "y": 1903.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7fb21e6a.21f63",\r
+        "id": "c6a1c641.2a058",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4233.909423828125,\r
-        "y": 1807.4099426269531,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4336.47607421875,\r
+        "y": 1842.9766082763672,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "a55467d3.0aaea8",\r
-                "87797c29.69366"\r
+                "59cb321.8a1954c",\r
+                "49c6e1ec.24535"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a55467d3.0aaea8",\r
+        "id": "59cb321.8a1954c",\r
         "type": "set",\r
         "name": "set domain A node-id and tpn",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4459.0269775390625,\r
-        "y": 1762.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4561.5936279296875,\r
+        "y": 1798.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63176143.c85c48",\r
+        "id": "1febeafa.37d915",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3981.0269775390625,\r
-        "y": 2104.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4083.5936279296875,\r
+        "y": 2140.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "87797c29.69366",\r
+        "id": "49c6e1ec.24535",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4418.0269775390625,\r
-        "y": 1821.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4520.5936279296875,\r
+        "y": 1857.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "58b11002.4131b"\r
+                "8d839c87.82ade8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cef3ca9d.2c104",\r
+        "id": "ab68a575.dbe428",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<!--<parameter name=\"original_string\" value='`$tmp.aai.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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3922.0269775390625,\r
-        "y": 1651.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4024.5936279296875,\r
+        "y": 1687.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "51326991.7f2898",\r
-                "d61d1517.27825"\r
+                "f1409763.115658",\r
+                "697906a6.2f581"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d61d1517.27825",\r
+        "id": "697906a6.2f581",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4143.0269775390625,\r
-        "y": 1619.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4245.5936279296875,\r
+        "y": 1655.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "8ed0c03d.565928"\r
+                "54d6be87.274308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51326991.7f2898",\r
+        "id": "f1409763.115658",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4143.0269775390625,\r
-        "y": 1666.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4245.5936279296875,\r
+        "y": 1702.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "a6e04e00.ffd96"\r
+                "6390534f.61c684"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ed0c03d.565928",\r
+        "id": "54d6be87.274308",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4308.0269775390625,\r
-        "y": 1616.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4410.5936279296875,\r
+        "y": 1652.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "14cffe9c.903701"\r
+                "f9eb1fe5.bf94b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14cffe9c.903701",\r
+        "id": "f9eb1fe5.bf94b8",\r
         "type": "set",\r
         "name": "set domain-A.ltpId",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4490.0269775390625,\r
-        "y": 1620.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4592.5936279296875,\r
+        "y": 1656.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a6e04e00.ffd96",\r
+        "id": "6390534f.61c684",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 4310.0269775390625,\r
-        "y": 1666.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4412.5936279296875,\r
+        "y": 1702.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc685b27.bd32f",\r
+        "id": "78eb0221.5dfc84",\r
         "type": "comment",\r
         "name": "Not useful anymore",\r
         "info": "this domain-A.ltpId is not used anymore",\r
         "comments": "",\r
-        "x": 4533.0269775390625,\r
-        "y": 1596.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4635.5936279296875,\r
+        "y": 1632.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "258887d0.26df98",\r
+        "id": "42a0b5ef.0a3e6c",\r
         "type": "set",\r
         "name": "set domain A tunnel tp ip",\r
         "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",\r
         "comments": "",\r
-        "x": 4675.0269775390625,\r
-        "y": 2010.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4777.5936279296875,\r
+        "y": 2046.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7878d7b8.ad7df",\r
+        "id": "ba5b9e92.be837",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4816.0269775390625,\r
-        "y": 1825.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4918.5936279296875,\r
+        "y": 1861.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "346dd4d8.896974"\r
+                "897ba475.c5f53"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58b11002.4131b",\r
+        "id": "8d839c87.82ade8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4613.0269775390625,\r
-        "y": 1821.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4715.5936279296875,\r
+        "y": 1857.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "7878d7b8.ad7df"\r
+                "ba5b9e92.be837"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "346dd4d8.896974",\r
+        "id": "897ba475.c5f53",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4993.0269775390625,\r
-        "y": 1817.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5095.5936279296875,\r
+        "y": 1853.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "dd0e1ad2.389f1",\r
-                "34802cc8.f036dc",\r
-                "83c1d591.e453a"\r
+                "bef188d5.c786d8",\r
+                "792f44ce.13c154",\r
+                "18753ca.06672c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd0e1ad2.389f1",\r
+        "id": "bef188d5.c786d8",\r
         "type": "set",\r
         "name": "set domain A network-id",\r
         "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",\r
         "comments": "",\r
-        "x": 5208.0269775390625,\r
-        "y": 1798.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5310.5936279296875,\r
+        "y": 1834.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "34802cc8.f036dc",\r
+        "id": "792f44ce.13c154",\r
         "type": "get-resource",\r
         "name": "get-resource src network-resource",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5225.0269775390625,\r
-        "y": 1862.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5327.5936279296875,\r
+        "y": 1898.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c18da62b.d46198"\r
+                "5b892dc0.3c8d04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c18da62b.d46198",\r
+        "id": "5b892dc0.3c8d04",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5448.5269775390625,\r
-        "y": 1863.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5551.0936279296875,\r
+        "y": 1899.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "2a6e1402.9f26d4"\r
+                "ba2d6189.94da7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a6e1402.9f26d4",\r
+        "id": "ba2d6189.94da7",\r
         "type": "set",\r
         "name": "set domain A network-id, topo-id, client-id, etc",\r
         "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",\r
         "comments": "",\r
-        "x": 5713.0269775390625,\r
-        "y": 1852.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5815.5936279296875,\r
+        "y": 1888.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83c1d591.e453a",\r
+        "id": "18753ca.06672c3",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 5152.0269775390625,\r
-        "y": 1915.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5254.5936279296875,\r
+        "y": 1951.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "57f7d786.5549e8",\r
+        "id": "8130be42.c4b418",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2363.5269775390625,\r
-        "y": 2581.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2466.0936279296875,\r
+        "y": 2617.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3c2dcef.aae8f8",\r
+        "id": "9a15bd2c.c28818",\r
         "type": "get-resource",\r
         "name": "get-resource dst tp",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2444.527099609375,\r
-        "y": 2477.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2547.09375,\r
+        "y": 2513.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "8b9fb321.70992",\r
-                "205abd09.598d9a",\r
-                "79e9c51.a089fbc"\r
+                "bbfaea50.2f8978",\r
+                "48b1011.95ef3",\r
+                "f850bc1.45f5a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b9fb321.70992",\r
+        "id": "bbfaea50.2f8978",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2667.0269775390625,\r
-        "y": 2619.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2769.5936279296875,\r
+        "y": 2655.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "6279b5de.cc4ff4"\r
+                "8bd3d4c4.129cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "205abd09.598d9a",\r
+        "id": "48b1011.95ef3",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2651.0269775390625,\r
-        "y": 2670.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2753.5936279296875,\r
+        "y": 2706.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "46e04c65.2008ac"\r
+                "31d51c19.564114"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79e9c51.a089fbc",\r
+        "id": "f850bc1.45f5a4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2654.0269775390625,\r
-        "y": 2722.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2756.5936279296875,\r
+        "y": 2758.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "76686faa.840d7"\r
+                "e3e65a88.eeb708"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76686faa.840d7",\r
+        "id": "e3e65a88.eeb708",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2824.0269775390625,\r
-        "y": 2725.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2926.5936279296875,\r
+        "y": 2761.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46e04c65.2008ac",\r
+        "id": "31d51c19.564114",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2836.0269775390625,\r
-        "y": 2674.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2938.5936279296875,\r
+        "y": 2710.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8589fea6.82485",\r
+        "id": "93be1dc8.40e81",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3023.4097900390625,\r
-        "y": 2630.4140014648438,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3125.9764404296875,\r
+        "y": 2665.980667114258,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "12c89e29.9e0a4a"\r
+                "fdc63182.4572f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12c89e29.9e0a4a",\r
+        "id": "fdc63182.4572f",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3266.4097900390625,\r
-        "y": 2629.4140014648438,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3368.9764404296875,\r
+        "y": 2664.980667114258,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "441cee99.bfaf"\r
+                "d054e714.1f47"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6279b5de.cc4ff4",\r
+        "id": "8bd3d4c4.129cd",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2813.0269775390625,\r
-        "y": 2610.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2915.5936279296875,\r
+        "y": 2646.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "8589fea6.82485"\r
+                "93be1dc8.40e81"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "441cee99.bfaf",\r
+        "id": "d054e714.1f47",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3522.6954345703125,\r
-        "y": 2629.2357788085938,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3625.2620849609375,\r
+        "y": 2664.802444458008,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "ee93bb7d.d7a6"\r
+                "64e60c2e.997314"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee93bb7d.d7a6",\r
+        "id": "64e60c2e.997314",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3822.5269775390625,\r
-        "y": 2626.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3925.0936279296875,\r
+        "y": 2662.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "7f181100.6e913",\r
-                "d5405c3b.2180e",\r
-                "a9d72cbf.011738",\r
-                "aba88a5.2928878",\r
-                "ce4f5014.a0532"\r
+                "1bae9a4e.9212ce",\r
+                "de2043de.3cb548",\r
+                "3a2030d6.3a864",\r
+                "5ff21da9.833f84",\r
+                "8657cf90.772ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f181100.6e913",\r
+        "id": "1bae9a4e.9212ce",\r
         "type": "set",\r
         "name": "set domain C node ttp-id",\r
         "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",\r
         "comments": "",\r
-        "x": 4064.5269775390625,\r
-        "y": 2580.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4167.0936279296875,\r
+        "y": 2616.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d5405c3b.2180e",\r
+        "id": "de2043de.3cb548",\r
         "type": "get-resource",\r
         "name": "get-resource dst TTP",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-C.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4054.5269775390625,\r
-        "y": 2631.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4157.0936279296875,\r
+        "y": 2667.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "d43d5001.cef3c8"\r
+                "5c3476dc.51e558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d43d5001.cef3c8",\r
+        "id": "5c3476dc.51e558",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4242.0269775390625,\r
-        "y": 2629.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4344.5936279296875,\r
+        "y": 2665.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "e0b1256e.3d7278"\r
+                "4eaafddf.a6a3f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0b1256e.3d7278",\r
+        "id": "4eaafddf.a6a3f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4431.0269775390625,\r
-        "y": 2618.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4533.5936279296875,\r
+        "y": 2654.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "2dbd68c.e7c9e98"\r
+                "c29c48f8.7f86a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aba88a5.2928878",\r
+        "id": "5ff21da9.833f84",\r
         "type": "get-resource",\r
         "name": "get-resource dst pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3891.0269775390625,\r
-        "y": 2460.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3993.5936279296875,\r
+        "y": 2496.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "dc3d15fa.81276",\r
-                "84f6f122.84593",\r
-                "df513d92.eaab28"\r
+                "89d8cb14.97ad38",\r
+                "b75d0391.114cc8",\r
+                "e1054df9.4be03"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df513d92.eaab28",\r
+        "id": "e1054df9.4be03",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4086.527099609375,\r
-        "y": 2412.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4189.09375,\r
+        "y": 2448.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "992d2ff.35fffd"\r
+                "1aa1ec12.0bb82c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84f6f122.84593",\r
+        "id": "b75d0391.114cc8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4078.527099609375,\r
-        "y": 2467.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4181.09375,\r
+        "y": 2503.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "326a3ad9.081e7e"\r
+                "e4160067.4070c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc3d15fa.81276",\r
+        "id": "89d8cb14.97ad38",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4083.527099609375,\r
-        "y": 2524.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4186.09375,\r
+        "y": 2560.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "a9233954.28abb8"\r
+                "f68c7777.771208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "992d2ff.35fffd",\r
+        "id": "1aa1ec12.0bb82c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4230.909423828125,\r
-        "y": 2410.409942626953,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4333.47607421875,\r
+        "y": 2445.976608276367,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "faa22dd5.212148",\r
-                "9949d4ef.001688"\r
+                "f0006d82.9607f",\r
+                "e28e5fb.1f15da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "326a3ad9.081e7e",\r
+        "id": "e4160067.4070c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4246.527099609375,\r
-        "y": 2470.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4349.09375,\r
+        "y": 2506.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9233954.28abb8",\r
+        "id": "f68c7777.771208",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4235.527099609375,\r
-        "y": 2525.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4338.09375,\r
+        "y": 2561.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "faa22dd5.212148",\r
+        "id": "f0006d82.9607f",\r
         "type": "set",\r
         "name": "set domain C node-id and tpn",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4440.0269775390625,\r
-        "y": 2377.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4542.5936279296875,\r
+        "y": 2413.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9d72cbf.011738",\r
+        "id": "3a2030d6.3a864",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4010.0269775390625,\r
-        "y": 2672.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4112.5936279296875,\r
+        "y": 2708.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9949d4ef.001688",\r
+        "id": "e28e5fb.1f15da",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4419.0269775390625,\r
-        "y": 2428.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4521.5936279296875,\r
+        "y": 2464.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "b61d11ba.55b168"\r
+                "6f7c8401.0c5c44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce4f5014.a0532",\r
+        "id": "8657cf90.772ff",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3930.0269775390625,\r
-        "y": 2275.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4032.5936279296875,\r
+        "y": 2311.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "3a973be3.1f749c",\r
-                "bccf88ee.38b55"\r
+                "1edc2bcc.25093c",\r
+                "7c75489d.8c3e48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bccf88ee.38b55",\r
+        "id": "7c75489d.8c3e48",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4151.0269775390625,\r
-        "y": 2243.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4253.5936279296875,\r
+        "y": 2279.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "f5e2899d.2e99e8"\r
+                "1008d1fe.94472e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a973be3.1f749c",\r
+        "id": "1edc2bcc.25093c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4151.0269775390625,\r
-        "y": 2290.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4253.5936279296875,\r
+        "y": 2326.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c9477994.8451e8"\r
+                "409a6e6.a5b3f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5e2899d.2e99e8",\r
+        "id": "1008d1fe.94472e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4316.0269775390625,\r
-        "y": 2240.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4418.5936279296875,\r
+        "y": 2276.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "aecbcfe0.6e5048"\r
+                "e91b8d2.d0cd6f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aecbcfe0.6e5048",\r
+        "id": "e91b8d2.d0cd6f",\r
         "type": "set",\r
         "name": "set domain-C.ltpId",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4512.0269775390625,\r
-        "y": 2237.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4614.5936279296875,\r
+        "y": 2273.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9477994.8451e8",\r
+        "id": "409a6e6.a5b3f9",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 4318.0269775390625,\r
-        "y": 2290.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4420.5936279296875,\r
+        "y": 2326.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "abda304.2cd6cd",\r
+        "id": "8a9fa566.6d58a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5032.5269775390625,\r
-        "y": 2430.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5135.0936279296875,\r
+        "y": 2466.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "5c6e614a.9cad28",\r
-                "37c15682.dfe52a",\r
-                "ea1db027.01377"\r
+                "7fa0b1d.d6b0bd",\r
+                "7faa7643.b3f3a8",\r
+                "2f37cf12.b49ef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a710596.36ea6",\r
+        "id": "19157173.11a35f",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4819.5269775390625,\r
-        "y": 2429.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4922.0936279296875,\r
+        "y": 2465.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "abda304.2cd6cd"\r
+                "8a9fa566.6d58a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2dbd68c.e7c9e98",\r
+        "id": "c29c48f8.7f86a8",\r
         "type": "set",\r
         "name": "set domain C tunnel tp id",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 4664.0269775390625,\r
-        "y": 2617.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4766.5936279296875,\r
+        "y": 2653.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b61d11ba.55b168",\r
+        "id": "6f7c8401.0c5c44",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4614.0269775390625,\r
-        "y": 2428.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4716.5936279296875,\r
+        "y": 2464.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "8a710596.36ea6"\r
+                "19157173.11a35f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea1db027.01377",\r
+        "id": "2f37cf12.b49ef8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 5238.0269775390625,\r
-        "y": 2508.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5340.5936279296875,\r
+        "y": 2544.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12cd95a6.c3a7d2",\r
+        "id": "be660170.47dfc",\r
         "type": "comment",\r
         "name": "Not useful anymore",\r
         "info": "this domain-B.ltpId is not used anymore",\r
         "comments": "",\r
-        "x": 4555.0269775390625,\r
-        "y": 2209.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 4657.5936279296875,\r
+        "y": 2245.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5c6e614a.9cad28",\r
+        "id": "7fa0b1d.d6b0bd",\r
         "type": "set",\r
         "name": "set domain C network-id",\r
         "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",\r
         "comments": "",\r
-        "x": 5302.5269775390625,\r
-        "y": 2406.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5405.0936279296875,\r
+        "y": 2442.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "37c15682.dfe52a",\r
+        "id": "7faa7643.b3f3a8",\r
         "type": "get-resource",\r
         "name": "get-resource dst network-resource",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5312.5269775390625,\r
-        "y": 2452.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5415.0936279296875,\r
+        "y": 2488.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "826de71a.33a62"\r
+                "e4da28c1.f29fa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "826de71a.33a62",\r
+        "id": "e4da28c1.f29fa8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5528.0269775390625,\r
-        "y": 2443.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5630.5936279296875,\r
+        "y": 2479.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "2f251a3.863a066"\r
+                "93b6182a.3d472"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f251a3.863a066",\r
+        "id": "93b6182a.3d472",\r
         "type": "set",\r
         "name": "set domain B network-id, topo-id, client-id, etc",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 5782.5269775390625,\r
-        "y": 2449.7542724609375,\r
-        "z": "740154b1.db9c44",\r
+        "x": 5885.0936279296875,\r
+        "y": 2485.3209381103516,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "825fbafd.18c12",\r
+        "id": "4ccd67a2.a775c8",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2689.199951171875,\r
-        "y": 268.0833282470703,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2791.7666015625,\r
+        "y": 303.6499938964844,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "88dc17ca.c3603",\r
-                "d63ef024.cfef08"\r
+                "aa20e714.81e31",\r
+                "2de4f8e2.b5cb18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88dc17ca.c3603",\r
+        "id": "aa20e714.81e31",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2880.199951171875,\r
-        "y": 272.0833282470703,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2982.7666015625,\r
+        "y": 307.6499938964844,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "85988dae.be2118"\r
+                "4f32b0ce.2765f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85988dae.be2118",\r
+        "id": "4f32b0ce.2765f8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3007.199951171875,\r
-        "y": 271.0833282470703,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3109.7666015625,\r
+        "y": 306.6499938964844,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "1486884a.a84de"\r
+                "fabeb9f8.04ca88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1486884a.a84de",\r
+        "id": "fabeb9f8.04ca88",\r
         "type": "switchNode",\r
         "name": "switch 2-ROOTS in same domain?",\r
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3230.083251953125,\r
-        "y": 265.9666442871094,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3332.64990234375,\r
+        "y": 301.53330993652344,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "baa46e2a.1397b",\r
-                "5009aa1a.49b42c"\r
+                "412e1237.d5a904",\r
+                "43345576.1d340c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "baa46e2a.1397b",\r
+        "id": "412e1237.d5a904",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3437.083251953125,\r
-        "y": 202.96664428710938,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3539.64990234375,\r
+        "y": 238.53330993652344,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "9723b3.a56f645"\r
+                "f849ec26.60ce68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5009aa1a.49b42c",\r
+        "id": "43345576.1d340c",\r
         "type": "outcomeTrue",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3367.083251953125,\r
-        "y": 393.9666748046875,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3469.64990234375,\r
+        "y": 429.53334045410156,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "9e442fe7.197ca8"\r
+                "2b8c6199.dff38e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9723b3.a56f645",\r
+        "id": "f849ec26.60ce68",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3579.083251953125,\r
-        "y": 192.96664428710938,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3681.64990234375,\r
+        "y": 228.53330993652344,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "74ae9ae0.0891cc",\r
-                "a08d8202.0e48d8"\r
+                "7903a049.c8cd48",\r
+                "db701786.21e23"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e442fe7.197ca8",\r
+        "id": "2b8c6199.dff38e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3493.083251953125,\r
-        "y": 393.9666748046875,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3595.64990234375,\r
+        "y": 429.53334045410156,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "7af5d9ce.fbbb7"\r
+                "66a832b6.6cd354"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "821af63c.9d499",\r
+        "id": "27e9a268.b581ce",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2489.966796875,\r
-        "y": 271.0833435058594,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2592.533447265625,\r
+        "y": 306.65000915527344,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "825fbafd.18c12"\r
+                "4ccd67a2.a775c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d63ef024.cfef08",\r
+        "id": "2de4f8e2.b5cb18",\r
         "type": "outcomeTrue",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2884.933349609375,\r
-        "y": 224.0833282470703,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2987.5,\r
+        "y": 259.6499938964844,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "3d7e803.580f08"\r
+                "fe5f3417.d45418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74ae9ae0.0891cc",\r
+        "id": "7903a049.c8cd48",\r
         "type": "set",\r
         "name": "set otnTopoIdDst",\r
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
-        "x": 3737.666748046875,\r
-        "y": 172.0833282470703,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3840.2333984375,\r
+        "y": 207.64999389648438,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a08d8202.0e48d8",\r
+        "id": "db701786.21e23",\r
         "type": "set",\r
         "name": "set otnTopoIdDstBackup",\r
         "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
-        "x": 3759.666748046875,\r
-        "y": 220.0833282470703,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3862.2333984375,\r
+        "y": 255.64999389648438,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7af5d9ce.fbbb7",\r
+        "id": "66a832b6.6cd354",\r
         "type": "set",\r
         "name": "set otnTopoIdDst",\r
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
-        "x": 3663.666748046875,\r
-        "y": 394.0833435058594,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3766.2333984375,\r
+        "y": 429.65000915527344,\r
+        "z": "a133aed2.437bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dccf569f.2f16c",\r
+        "id": "cc22664a.751d9",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2558.683349609375,\r
-        "y": 345.8833312988281,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2661.25,\r
+        "y": 381.4499969482422,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "bb64af5d.7bf708"\r
+                "2f2b5b65.5b64dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb64af5d.7bf708",\r
+        "id": "2f2b5b65.5b64dc",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2757.91650390625,\r
-        "y": 342.88331604003906,\r
-        "z": "740154b1.db9c44",\r
+        "x": 2860.483154296875,\r
+        "y": 378.4499816894531,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "c6cf934.ca6387"\r
+                "36697354.fca184"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6cf934.ca6387",\r
+        "id": "36697354.fca184",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2948.91650390625,\r
-        "y": 346.88331604003906,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3051.483154296875,\r
+        "y": 382.4499816894531,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "84398364.2e39d"\r
+                "5c3e361c.5c18a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84398364.2e39d",\r
+        "id": "5c3e361c.5c18a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3075.91650390625,\r
-        "y": 345.88331604003906,\r
-        "z": "740154b1.db9c44",\r
+        "x": 3178.483154296875,\r
+        "y": 381.4499816894531,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cdc2b636.8886c8",\r
+        "id": "b1b9b64d.59ccf8",\r
         "type": "switchNode",\r
         "name": "switch secondarySolutions empty?",\r
         "xml": "<switch test='`length($otn-oof.secondarySolutions) == 0`'>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1419.566650390625,\r
-        "y": 1649.566650390625,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1522.13330078125,\r
+        "y": 1685.133316040039,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "930ebbc8.d33d1",\r
-                "e9824426.b9b25"\r
+                "65a1fc27.84c2b4",\r
+                "d975b6ca.6d1d08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "930ebbc8.d33d1",\r
+        "id": "65a1fc27.84c2b4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1645.4666748046875,\r
-        "y": 1621.566650390625,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1748.0333251953125,\r
+        "y": 1657.133316040039,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "82cb40cb.6ece7"\r
+                "c43f0dda.93b268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9824426.b9b25",\r
+        "id": "d975b6ca.6d1d08",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1643.4666748046875,\r
-        "y": 1671.566650390625,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1746.0333251953125,\r
+        "y": 1707.133316040039,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "82cb40cb.6ece7",\r
+        "id": "c43f0dda.93b268",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1787.566650390625,\r
-        "y": 1621.566650390625,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1890.13330078125,\r
+        "y": 1657.133316040039,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7d4b4351.930cbc",\r
+        "id": "949527f9.d2ae5",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 798.4666748046875,\r
-        "y": 1838.566650390625,\r
-        "z": "740154b1.db9c44",\r
+        "x": 901.0333251953125,\r
+        "y": 1874.133316040039,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "9310b044.9b3228"\r
+                "c20cf138.dc1e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9310b044.9b3228",\r
+        "id": "c20cf138.dc1e5",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 984.4666748046875,\r
-        "y": 1839.566650390625,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1087.0333251953125,\r
+        "y": 1875.133316040039,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "40a7bba6.ae5b54"\r
+                "2941d5fe.c9ad8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40a7bba6.ae5b54",\r
+        "id": "2941d5fe.c9ad8a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1114.4666748046875,\r
-        "y": 1839.566650390625,\r
-        "z": "740154b1.db9c44",\r
+        "x": 1217.0333251953125,\r
+        "y": 1875.133316040039,\r
+        "z": "a133aed2.437bc",\r
         "wires": [\r
             [\r
-                "e1473f30.10032"\r
+                "c19998ca.837848"\r
             ]\r
         ]\r
     }\r

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 142ea56..61661e2 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
@@ -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 a874168..32db942 100644 (file)
--- 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 c71b7aa..ea5afba 100644 (file)
--- 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 325b58b..85b0fca 100644 (file)
--- 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>\r
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
                                               resource="pnfs"\r
-                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'"\r
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0"\r
                                               local-only="false"\r
                                               pfx="ccsdkTopopnfs" ></get-resource>\r
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
                                               resource="logical-links"\r
-                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'"\r
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'"\r
                                               local-only="false"\r
                                               pfx="ccsdkTopologicalLinks" ></get-resource>\r
                                 <set>\r
@@ -993,10 +993,10 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\r
-                                                                                                                    <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/'` " />\r
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\r
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\r
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\r
+                                                                                                                    <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/'` " />\r
                                                                                                                 </save>\r
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
                                                                                                                       key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
@@ -1060,10 +1060,10 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\r
-                                                                                                                    <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/'` " />\r
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\r
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\r
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\r
+                                                                                                                    <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/'` " />\r
                                                                                                                 </save>\r
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
                                                                                                                       key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
@@ -1154,10 +1154,10 @@
                                                                                                                                             <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
                                                                                                                                             <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
                                                                                                                                             <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
-                                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
-                                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
-                                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\r
-                                                                                                                                            <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/'` " />\r
+                                                                                                                                            <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\r
+                                                                                                                                            <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\r
+                                                                                                                                            <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\r
+                                                                                                                                            <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/'` " />\r
                                                                                                                                         </save>\r
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
                                                                                                                                               key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
@@ -1217,10 +1217,10 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\r
-                                                                                                                    <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/'` " />\r
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\r
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\r
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\r
+                                                                                                                    <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/'` " />\r
                                                                                                                 </save>\r
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
                                                                                                                       key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
@@ -1470,10 +1470,10 @@
                                                                                                                                             <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
                                                                                                                                             <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
                                                                                                                                             <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
-                                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
-                                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
-                                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\r
-                                                                                                                                            <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/'` " />\r
+                                                                                                                                            <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\r
+                                                                                                                                            <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\r
+                                                                                                                                            <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\r
+                                                                                                                                            <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/'` " />\r
                                                                                                                                         </save>\r
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
                                                                                                                                               key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r

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 7c1d873..acae25e 100644 (file)
--- 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 0074c34..ac502c6 100644 (file)
--- 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},