Support for proper deletion of vpn-bindings when there are multiple CLLs and multiple... 31/125031/1
authorHesam Rahimi <hesam.rahimi@huawei.com>
Fri, 15 Oct 2021 16:14:41 +0000 (12:14 -0400)
committerHesam Rahimi <hesam.rahimi@huawei.com>
Fri, 15 Oct 2021 16:17:21 +0000 (12:17 -0400)
Issue-ID: SDNC-1594
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: Iae468575a26b45efa069e87814f41739c9e7563b

Former-commit-id: 904f8819208b26f7a6b715540319d076d3819cb7

platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.json
platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml
platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml

index de9383d..ecbe092 100644 (file)
 [\r
     {\r
-        "id": "a88af18.67fae9",\r
+        "id": "3822698e.fe6a9e",\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": 2806.316619873047,\r
-        "y": 668.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2722.4332885742188,\r
+        "y": 1488,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "d17bb726.fa65e8"\r
+                "61592847.4c1088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d17bb726.fa65e8",\r
+        "id": "61592847.4c1088",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2943.316619873047,\r
-        "y": 756.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2859.4332885742188,\r
+        "y": 1576,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "141e9731.53d429"\r
+                "a18c2b6d.4397b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a075e5f.de06b8",\r
+        "id": "62ff1995.5919b8",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3328.316619873047,\r
-        "y": 769.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3244.4332885742188,\r
+        "y": 1589,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "bfab05fb.6c1fd",\r
-                "66b97fa3.09fba8",\r
-                "a61f3fb8.28c2b"\r
+                "93829917.caf878",\r
+                "4d145f4b.31c318",\r
+                "47a377cc.3a6e08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "141e9731.53d429",\r
+        "id": "a18c2b6d.4397b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3122.316619873047,\r
-        "y": 756.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3038.4332885742188,\r
+        "y": 1576,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "6ba56bd3.970cc4",\r
-                "5a075e5f.de06b8",\r
-                "f743ac29.02b56"\r
+                "f904d45e.838058",\r
+                "62ff1995.5919b8",\r
+                "1ddc0d65.0a518b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ba56bd3.970cc4",\r
+        "id": "f904d45e.838058",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 3358.316619873047,\r
-        "y": 717.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3274.4332885742188,\r
+        "y": 1537,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bfab05fb.6c1fd",\r
+        "id": "93829917.caf878",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3538.316619873047,\r
-        "y": 760.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3454.4332885742188,\r
+        "y": 1580,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "9395b4f9.f11e08"\r
+                "77ca3f11.791e38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66b97fa3.09fba8",\r
+        "id": "4d145f4b.31c318",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3530.316619873047,\r
-        "y": 815.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3446.4332885742188,\r
+        "y": 1635,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "6a113c41.2b7f84"\r
+                "40a5f22a.13a82c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a61f3fb8.28c2b",\r
+        "id": "47a377cc.3a6e08",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3535.316619873047,\r
-        "y": 872.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3451.4332885742188,\r
+        "y": 1692,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "ae24d388.debf2"\r
+                "a269a8ad.5fc788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae24d388.debf2",\r
+        "id": "a269a8ad.5fc788",\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": 3687.316619873047,\r
-        "y": 873.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3603.4332885742188,\r
+        "y": 1693,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a113c41.2b7f84",\r
+        "id": "40a5f22a.13a82c",\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": 3698.316619873047,\r
-        "y": 818.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3614.4332885742188,\r
+        "y": 1638,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9395b4f9.f11e08",\r
+        "id": "77ca3f11.791e38",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3682.698944091797,\r
-        "y": 758.5389709472656,\r
-        "z": "347519d8.005516",\r
+        "x": 3598.8156127929688,\r
+        "y": 1577.6556701660156,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "e30efe2.36b498"\r
+                "1f7af3e2.81853c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e30efe2.36b498",\r
+        "id": "1f7af3e2.81853c",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 3897.316619873047,\r
-        "y": 754.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3813.4332885742188,\r
+        "y": 1574,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f743ac29.02b56",\r
+        "id": "1ddc0d65.0a518b",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3278.316619873047,\r
-        "y": 833.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 3194.4332885742188,\r
+        "y": 1653,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98d7bf6.4dfe7c",\r
+        "id": "e639cfa.29b4c3",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 2698.816619873047,\r
-        "y": 955.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2614.9332885742188,\r
+        "y": 1775,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "61820fcc.882e",\r
+        "id": "1f0101e1.8e6866",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2694.316619873047,\r
-        "y": 1020.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2610.4332885742188,\r
+        "y": 1840,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5b3a4445.ce6224",\r
+        "id": "944f61d3.f96e18",\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": 2604.3164978027344,\r
-        "y": 741.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2520.4331665039062,\r
+        "y": 1561,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "a88af18.67fae9"\r
+                "3822698e.fe6a9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "132ce225.b79cae",\r
+        "id": "63959115.b850c",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 2052.316375732422,\r
-        "y": 721.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 1968.4330444335938,\r
+        "y": 1541,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5cdb5a7a.54733c",\r
+        "id": "a62a741e.9cd9d",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2080.3164978027344,\r
-        "y": 791.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 1996.4331665039062,\r
+        "y": 1611,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "6c0f168f.8aad68",\r
-                "cd12f0b4.568798",\r
-                "80b1b093.b4332"\r
+                "ca780146.c1231",\r
+                "2112ad82.c29caa",\r
+                "937e0d43.e6cd18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c0f168f.8aad68",\r
+        "id": "ca780146.c1231",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2275.816619873047,\r
-        "y": 743.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2191.9332885742188,\r
+        "y": 1563,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "99130a65.69efe8"\r
+                "7599f2ce.c74a1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd12f0b4.568798",\r
+        "id": "2112ad82.c29caa",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2267.816619873047,\r
-        "y": 798.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2183.9332885742188,\r
+        "y": 1618,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "80ce6dda.3e5e5"\r
+                "5027d99d.8613"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99130a65.69efe8",\r
+        "id": "7599f2ce.c74a1c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2420.198944091797,\r
-        "y": 743.5389709472656,\r
-        "z": "347519d8.005516",\r
+        "x": 2336.3156127929688,\r
+        "y": 1562.6556701660156,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "5b3a4445.ce6224"\r
+                "944f61d3.f96e18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80b1b093.b4332",\r
+        "id": "937e0d43.e6cd18",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2272.816619873047,\r
-        "y": 855.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2188.9332885742188,\r
+        "y": 1675,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "b4d035fe.9cf0b"\r
+                "76756fa2.c3dc2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4d035fe.9cf0b",\r
+        "id": "76756fa2.c3dc2",\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": 2424.816619873047,\r
-        "y": 856.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2340.9332885742188,\r
+        "y": 1676,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80ce6dda.3e5e5",\r
+        "id": "5027d99d.8613",\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": 2435.816619873047,\r
-        "y": 799.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2351.9332885742188,\r
+        "y": 1619,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cbce5afd.0d149",\r
+        "id": "64d61f83.5de088",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2190.316619873047,\r
-        "y": 985.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2106.4332885742188,\r
+        "y": 1805,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "38dfa115.008496",\r
-                "f31653a0.9143e8"\r
+                "847a88ab.176f8",\r
+                "60c8b991.b738f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38dfa115.008496",\r
+        "id": "847a88ab.176f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2522.816619873047,\r
-        "y": 955.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2438.9332885742188,\r
+        "y": 1775,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "98d7bf6.4dfe7c"\r
+                "e639cfa.29b4c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f31653a0.9143e8",\r
+        "id": "60c8b991.b738f",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2527.816619873047,\r
-        "y": 1020.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2443.9332885742188,\r
+        "y": 1840,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "61820fcc.882e"\r
+                "1f0101e1.8e6866"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30af1423.cd4b6c",\r
+        "id": "a3d6fe2.756c3",\r
         "type": "save",\r
         "name": "delete vpn-binding resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2113.316619873047,\r
-        "y": 1116.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2029.4332885742188,\r
+        "y": 1936,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d0b44cbe.a16a5",\r
+        "id": "f2fb74bb.786498",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1822.3166198730469,\r
-        "y": 941.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 1738.4332885742188,\r
+        "y": 1761,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "132ce225.b79cae",\r
-                "5cdb5a7a.54733c",\r
-                "cbce5afd.0d149",\r
-                "30af1423.cd4b6c",\r
-                "b097652b.150d7",\r
-                "e258ce61.c84d28"\r
+                "63959115.b850c",\r
+                "a62a741e.9cd9d",\r
+                "64d61f83.5de088",\r
+                "a3d6fe2.756c3",\r
+                "d781a807.293c48",\r
+                "c5cf8874.0fba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b097652b.150d7",\r
+        "id": "d781a807.293c48",\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": 2101.5164489746094,\r
-        "y": 624.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2017.6331176757812,\r
+        "y": 1444,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e258ce61.c84d28",\r
+        "id": "c5cf8874.0fba",\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": 2093.5164489746094,\r
-        "y": 673.88330078125,\r
-        "z": "347519d8.005516",\r
+        "x": 2009.6331176757812,\r
+        "y": 1493,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3c24f82.dfab088",\r
+        "id": "ea6bf698.38c53",\r
         "type": "comment",\r
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1023.5003967285156,\r
-        "y": 746.39990234375,\r
-        "z": "347519d8.005516",\r
+        "x": 939.6170654296875,\r
+        "y": 1565.5166015625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "570ad10f.ad92f8",\r
+        "id": "6975d798.e5c738",\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": 921.5003967285156,\r
-        "y": 781.39990234375,\r
-        "z": "347519d8.005516",\r
+        "x": 837.6170654296875,\r
+        "y": 1600.5166015625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "f405b75.e7a9fc8",\r
-                "4e9de096.f468b",\r
-                "9757d76.73f10a8"\r
+                "c993cc39.ec87d",\r
+                "2a52cdc6.c6690a",\r
+                "7a224e7c.af9708"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f405b75.e7a9fc8",\r
+        "id": "c993cc39.ec87d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1126.5003967285156,\r
-        "y": 778.39990234375,\r
-        "z": "347519d8.005516",\r
+        "x": 1042.6170654296875,\r
+        "y": 1597.5166015625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "5de56166.922018"\r
+                "6326654e.b84854"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e9de096.f468b",\r
+        "id": "2a52cdc6.c6690a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1109.9913635253906,\r
-        "y": 839.9739379882812,\r
-        "z": "347519d8.005516",\r
+        "x": 1026.1080322265625,\r
+        "y": 1659.0906372070312,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "a1062ebe.b15808"\r
+                "a71bbbd1.f4a8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9757d76.73f10a8",\r
+        "id": "7a224e7c.af9708",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1107.5003967285156,\r
-        "y": 883.39990234375,\r
-        "z": "347519d8.005516",\r
+        "x": 1023.6170654296875,\r
+        "y": 1702.5166015625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "10e74f8b.3fb4a8"\r
+                "ec0ca87c.f45398"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5de56166.922018",\r
+        "id": "6326654e.b84854",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1294.5006408691406,\r
-        "y": 773.39990234375,\r
-        "z": "347519d8.005516",\r
+        "x": 1210.6173095703125,\r
+        "y": 1592.5166015625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "fdc657b.398c8a8"\r
+                "2bc4a679.cf5d3a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1062ebe.b15808",\r
+        "id": "a71bbbd1.f4a8c",\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": 1272.5627746582031,\r
-        "y": 840.2596740722656,\r
-        "z": "347519d8.005516",\r
+        "x": 1188.679443359375,\r
+        "y": 1659.3763732910156,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "10e74f8b.3fb4a8",\r
+        "id": "ec0ca87c.f45398",\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": 1274.5003967285156,\r
-        "y": 882.39990234375,\r
-        "z": "347519d8.005516",\r
+        "x": 1190.6170654296875,\r
+        "y": 1701.5166015625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fdc657b.398c8a8",\r
+        "id": "2bc4a679.cf5d3a",\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": 920.5007019042969,\r
-        "y": 1018.39990234375,\r
-        "z": "347519d8.005516",\r
+        "x": 836.6173706054688,\r
+        "y": 1837.5166015625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "5a8644f1.6f626c"\r
+                "7c4d0989.9bb298"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a8644f1.6f626c",\r
+        "id": "7c4d0989.9bb298",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1150.5004577636719,\r
-        "y": 1006.39990234375,\r
-        "z": "347519d8.005516",\r
+        "x": 1066.6171264648438,\r
+        "y": 1825.5166015625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "71241a5.135ba64"\r
+                "bd37314.c09c9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71241a5.135ba64",\r
+        "id": "bd37314.c09c9d",\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": 1386.3168640136719,\r
-        "y": 1005.56640625,\r
-        "z": "347519d8.005516",\r
+        "x": 1302.4335327148438,\r
+        "y": 1824.68310546875,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "4253fbea.3b4874",\r
-                "6cef3566.dab14c"\r
+                "d2ea08ce.4f3608",\r
+                "40b454d5.b7ece4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4253fbea.3b4874",\r
+        "id": "d2ea08ce.4f3608",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1616.3168640136719,\r
-        "y": 1000.56591796875,\r
-        "z": "347519d8.005516",\r
+        "x": 1532.4335327148438,\r
+        "y": 1819.6826171875,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "d0b44cbe.a16a5"\r
+                "f2fb74bb.786498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cef3566.dab14c",\r
+        "id": "40b454d5.b7ece4",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1627.3168640136719,\r
-        "y": 1043.56591796875,\r
-        "z": "347519d8.005516",\r
+        "x": 1543.4335327148438,\r
+        "y": 1862.6826171875,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3070392b.33f8c6",\r
+        "id": "3e5224b.295e95c",\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": 1170.9999694824219,\r
-        "y": 593.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1161.1166381835938,\r
+        "y": 618.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45e829a.7cbd958",\r
+        "id": "2f96b0a0.fe469",\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": 900.2001037597656,\r
-        "y": 707.39990234375,\r
-        "z": "347519d8.005516",\r
+        "x": 816.3167724609375,\r
+        "y": 1526.5166015625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "304ed1d7.4f9efe",\r
+        "id": "8609633e.a887d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 663.9999694824219,\r
-        "y": 737.2333984375,\r
-        "z": "347519d8.005516",\r
+        "x": 580.1166381835938,\r
+        "y": 1556.35009765625,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "45e829a.7cbd958",\r
-                "570ad10f.ad92f8"\r
+                "2f96b0a0.fe469",\r
+                "6975d798.e5c738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7df4e9d5.2bc648",\r
+        "id": "483fdff.aacb22",\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": 1515.9999694824219,\r
-        "y": 455.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1506.1166381835938,\r
+        "y": 480.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "a43c232c.85575"\r
+                "c84682e7.370ef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "561ea33d.a2ffb4",\r
+        "id": "dda9e843.2f3f18",\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": 1222.9999694824219,\r
-        "y": 449.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1213.1166381835938,\r
+        "y": 474.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "7df4e9d5.2bc648"\r
+                "483fdff.aacb22"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e515252.bebdb6",\r
+        "id": "d616c0c5.fad828",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1477.9999694824219,\r
-        "y": 406.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1468.1166381835938,\r
+        "y": 431.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "36a9a792.12dcb8",\r
+        "id": "a2a08a1a.858e78",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
         "comments": "",\r
-        "x": 1166.9999694824219,\r
-        "y": 501.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1157.1166381835938,\r
+        "y": 526.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a69687a.5611c",\r
+        "id": "201e5d50.a3833a",\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": 1174.9999694824219,\r
-        "y": 546.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1165.1166381835938,\r
+        "y": 571.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f3c1922.734777",\r
+        "id": "6eecdb5f.76c2ac",\r
         "type": "set",\r
         "name": "unset otnTopoIdSrc",\r
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
         "comments": "",\r
-        "x": 1171.9999694824219,\r
-        "y": 399.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1162.1166381835938,\r
+        "y": 424.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a43c232c.85575",\r
+        "id": "c84682e7.370ef",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1424.9999694824219,\r
-        "y": 523.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1415.1166381835938,\r
+        "y": 548.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "f8e0e906.2dd5c"\r
+                "ab0f32b5.16cbf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f8e0e906.2dd5c",\r
+        "id": "ab0f32b5.16cbf8",\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": 1609.9999694824219,\r
-        "y": 522.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1600.1166381835938,\r
+        "y": 547.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "8c6726fe.7433a8"\r
+                "51342e13.198088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc1b4364.1c9f18",\r
+        "id": "3e0e37bf.5a574",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 866.9999694824219,\r
-        "y": 421.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 857.1166381835938,\r
+        "y": 446.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "7c0eef33.a4cac8",\r
-                "ba37203f.b37c18",\r
-                "36a9a792.12dcb8",\r
-                "2a69687a.5611c",\r
-                "3070392b.33f8c6",\r
-                "561ea33d.a2ffb4",\r
-                "304ed1d7.4f9efe"\r
+                "a4e53180.2dfc9",\r
+                "128161ed.802f86",\r
+                "a2a08a1a.858e78",\r
+                "201e5d50.a3833a",\r
+                "3e5224b.295e95c",\r
+                "dda9e843.2f3f18",\r
+                "9fcccd6f.e18a48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59a1e33e.932044",\r
+        "id": "b0a1b203.5dc08",\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": 851.9999694824219,\r
-        "y": 355.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 842.1166381835938,\r
+        "y": 380.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba37203f.b37c18",\r
+        "id": "128161ed.802f86",\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": 1230.9999694824219,\r
-        "y": 342.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1221.1166381835938,\r
+        "y": 367.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "c06f47ba.39269",\r
-                "e8314c16.79663",\r
-                "2e515252.bebdb6"\r
+                "6219ad91.7b0784",\r
+                "4229f1dc.fc23b8",\r
+                "d616c0c5.fad828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c06f47ba.39269",\r
+        "id": "6219ad91.7b0784",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1466.9999694824219,\r
-        "y": 325.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1457.1166381835938,\r
+        "y": 350.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e8314c16.79663",\r
+        "id": "4229f1dc.fc23b8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1463.9999694824219,\r
-        "y": 366.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1454.1166381835938,\r
+        "y": 391.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7c0eef33.a4cac8",\r
+        "id": "a4e53180.2dfc9",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
         "comments": "",\r
-        "x": 1179.9999694824219,\r
-        "y": 299.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1170.1166381835938,\r
+        "y": 324.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c6726fe.7433a8",\r
+        "id": "51342e13.198088",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1801.9999694824219,\r
-        "y": 525.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1792.1166381835938,\r
+        "y": 550.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "99c0dc88.ef82e8"\r
+                "6b44ef76.186218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99c0dc88.ef82e8",\r
+        "id": "6b44ef76.186218",\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": 1973.9999694824219,\r
-        "y": 521.283203125,\r
-        "z": "347519d8.005516",\r
+        "x": 1964.1166381835938,\r
+        "y": 546.3998718261719,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2cbaaf0.8cf72",\r
+        "id": "425448fb.cf113",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 154.88333129882812,\r
-        "y": 89.88333129882812,\r
-        "z": "347519d8.005516",\r
+        "x": 145,\r
+        "y": 115,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "a811003b.ca91f8"\r
+                "99235c0c.841188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a811003b.ca91f8",\r
+        "id": "99235c0c.841188",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 439.1690216064453,\r
-        "y": 151.12143993377686,\r
-        "z": "347519d8.005516",\r
+        "x": 429.2856903076172,\r
+        "y": 176.23810863494873,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "5803201b.e752d"\r
+                "d962c511.69b1b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5803201b.e752d",\r
+        "id": "d962c511.69b1b8",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-delete-VPNBs",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 445.3119354248047,\r
-        "y": 235.88336181640625,\r
-        "z": "347519d8.005516",\r
+        "x": 435.42860412597656,\r
+        "y": 261.0000305175781,\r
+        "z": "ec6164d7.ff9708",\r
         "wires": [\r
             [\r
-                "cc1b4364.1c9f18"\r
+                "3e0e37bf.5a574"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "9fcccd6f.e18a48",\r
+        "type": "for",\r
+        "name": "for each relationship of middle-man-conn",\r
+        "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 806.63330078125,\r
+        "y": 876.0833740234375,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "fe8b9bc1.266868"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fe8b9bc1.266868",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1106.967041015625,\r
+        "y": 871.0833129882812,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "a50ce6d7.7af75"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a50ce6d7.7af75",\r
+        "type": "outcome",\r
+        "name": "connectivity",\r
+        "xml": "<outcome value='connectivity'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1286.6336669921875,\r
+        "y": 871.0834045410156,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "878c81c6.c1cf08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "878c81c6.c1cf08",\r
+        "type": "save",\r
+        "name": "get connectivity from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1486.633544921875,\r
+        "y": 871.0833740234375,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "e5ce5572.0e9be",\r
+                "220d084e.f1aa2",\r
+                "8b2d18ec.0684a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8b2d18ec.0684a8",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1717.683349609375,\r
+        "y": 821.8831787109375,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "220d084e.f1aa2",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1715.1923828125,\r
+        "y": 865.3091430664062,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e5ce5572.0e9be",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1693.63330078125,\r
+        "y": 921.0833740234375,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "adf18092.0df43"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "adf18092.0df43",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 695.866943359375,\r
+        "y": 1018.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "841267bf.5a37d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "841267bf.5a37d8",\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": 869.866943359375,\r
+        "y": 1020.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "83e51395.23054"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "83e51395.23054",\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": 1066.866943359375,\r
+        "y": 1034.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "20d4597f.7ec4fe"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "20d4597f.7ec4fe",\r
+        "type": "outcome",\r
+        "name": "vpn-binding",\r
+        "xml": "<outcome value='vpn-binding'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1234.866943359375,\r
+        "y": 1027.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "962e1e07.ed3e1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "962e1e07.ed3e1",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1397.866943359375,\r
+        "y": 1027.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "b3331932.59a4e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b3331932.59a4e",\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": 1073.866943359375,\r
+        "y": 1167.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "1d1a3767.b90801",\r
+                "1205c3c9.a1fe14",\r
+                "ac824193.0ceb4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1d1a3767.b90801",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1284.866943359375,\r
+        "y": 1169.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "ce3bd26f.86a788"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1205c3c9.a1fe14",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1285.35791015625,\r
+        "y": 1214.8571166992188,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "8c52b3a4.bb9928"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ac824193.0ceb4",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1282.866943359375,\r
+        "y": 1258.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "b8796894.76af28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8c52b3a4.bb9928",\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": 1447.9293212890625,\r
+        "y": 1215.1428527832031,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b8796894.76af28",\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": 1449.866943359375,\r
+        "y": 1257.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3d324826.e49518",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2047.866943359375,\r
+        "y": 1097.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "cd0aab83.f02f78",\r
+                "8058933f.2691e",\r
+                "f481dab1.2bbd68",\r
+                "119a4845.874928",\r
+                "5f76b8d0.e5e58"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cd0aab83.f02f78",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
+        "comments": "",\r
+        "x": 2269.866943359375,\r
+        "y": 815.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8058933f.2691e",\r
+        "type": "get-resource",\r
+        "name": "get-resource src pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2295.866943359375,\r
+        "y": 932.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "d483622c.685ad",\r
+                "b6de022b.29ab58",\r
+                "e510b446.5dd1e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f481dab1.2bbd68",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2398.866943359375,\r
+        "y": 1199.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "422a3d0e.0ac58c",\r
+                "dc94e365.153108"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d483622c.685ad",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2491.3670654296875,\r
+        "y": 884.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "d09e0056.1e082"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b6de022b.29ab58",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2483.3670654296875,\r
+        "y": 939.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "9a521350.d6234"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d09e0056.1e082",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2625.749267578125,\r
+        "y": 878.9388427734375,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "f0956103.d162e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e510b446.5dd1e8",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2488.3670654296875,\r
+        "y": 996.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "e16f9ab0.64cc3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e16f9ab0.64cc3",\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": 2640.3670654296875,\r
+        "y": 997.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9a521350.d6234",\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": 2651.3670654296875,\r
+        "y": 940.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f0956103.d162e8",\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": 2812.866455078125,\r
+        "y": 880.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "af503a6c.61f9f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "af503a6c.61f9f8",\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": 3053.866455078125,\r
+        "y": 871.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "b61fba47.4726f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "422a3d0e.0ac58c",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2706.366455078125,\r
+        "y": 1224.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "dec1fd1f.efb3a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dc94e365.153108",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2707.366455078125,\r
+        "y": 1169.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "52cd10d1.f921d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dec1fd1f.efb3a",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",\r
+        "comments": "",\r
+        "x": 2878.366455078125,\r
+        "y": 1222.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "52cd10d1.f921d8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2874.866455078125,\r
+        "y": 1171.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a1fe3dae.a2d208",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3410.8662109375,\r
+        "y": 820.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "e7174ef6.88aea",\r
+                "bfd51d3e.a21cb8",\r
+                "b48cd5e6.4e4b88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b61fba47.4726f8",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3259.866455078125,\r
+        "y": 868.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "a1fe3dae.a2d208"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bfd51d3e.a21cb8",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3616.8662109375,\r
+        "y": 833.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "cb1cf6fc.9ef978",\r
+                "7d19de07.9d61",\r
+                "2bc4bb18.4f1464"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e7174ef6.88aea",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domain id",\r
+        "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 3646.8662109375,\r
+        "y": 781.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cb1cf6fc.9ef978",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3826.8662109375,\r
+        "y": 824.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "a4768784.394af8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7d19de07.9d61",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3818.8662109375,\r
+        "y": 879.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "4478591a.9ef568"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2bc4bb18.4f1464",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3823.8662109375,\r
+        "y": 936.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "23b7e106.ef601e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b48cd5e6.4e4b88",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 3566.8662109375,\r
+        "y": 897.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "23b7e106.ef601e",\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": 3975.8662109375,\r
+        "y": 937.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4478591a.9ef568",\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": 3986.8662109375,\r
+        "y": 882.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a4768784.394af8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3971.24853515625,\r
+        "y": 821.9387512207031,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "98ec4d86.407d4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "98ec4d86.407d4",\r
+        "type": "set",\r
+        "name": "set controller domain data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
+        "comments": "",\r
+        "x": 4185.8662109375,\r
+        "y": 818.2830810546875,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "371b3631.1fe46a",\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": 1660.0999755859375,\r
+        "y": 1107.2833251953125,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "5dda0eba.cba228",\r
+                "cd15371c.43ee48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5dda0eba.cba228",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1890.0999755859375,\r
+        "y": 1102.2828369140625,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "3d324826.e49518"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cd15371c.43ee48",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1901.0999755859375,\r
+        "y": 1145.2828369140625,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ce3bd26f.86a788",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1440.0999755859375,\r
+        "y": 1164.683349609375,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            [\r
+                "371b3631.1fe46a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "119a4845.874928",\r
+        "type": "save",\r
+        "name": "delete vpn-binding resource in AAI",\r
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2345.816650390625,\r
+        "y": 1314.4833984375,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "5f76b8d0.e5e58",\r
+        "type": "set",\r
+        "name": "set Underlay OTN Tunnel Name tmp.underlayOTN",\r
+        "xml": "<set>\n<parameter name='tmp.underlayOTN' value=\"`$tmp.aai.vpn-binding.vpn-name`\" />\n",\r
+        "comments": "",\r
+        "x": 2348.0330810546875,\r
+        "y": 750.2833251953125,\r
+        "z": "ec6164d7.ff9708",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file
index fb09dbd..241228f 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "d1a7bbc1.540ca8",\r
+        "id": "4eba0592.d8f9ec",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
         "x": 171.88333129882812,\r
-        "y": 131.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 174,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6b49e250.7dcf1c"\r
+                "2ad94242.d34e8e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b49e250.7dcf1c",\r
+        "id": "2ad94242.d34e8e",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\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": 456.1690216064453,\r
-        "y": 193.12143993377686,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 235.23810863494873,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7d29f447.50c89c"\r
+                "86bffa6e.8633f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d29f447.50c89c",\r
+        "id": "86bffa6e.8633f8",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-delete",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 462.3119354248047,\r
-        "y": 277.88336181640625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 320.0000305175781,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "eaada3e3.80126"\r
+                "47cd43dd.6a0c84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eaada3e3.80126",\r
+        "id": "47cd43dd.6a0c84",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 811.8833312988281,\r
-        "y": 336.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 379,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "48b97bf1.34ba04",\r
-                "4cae2f6c.f9579",\r
-                "47d3b263.d1c534"\r
+                "17095ff1.ceb8e",\r
+                "f2cac95d.2dd4f",\r
+                "41a5db6f.16b124"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48b97bf1.34ba04",\r
+        "id": "17095ff1.ceb8e",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
         "x": 1113.2168273925781,\r
-        "y": 607.8136291503906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 649.9302978515625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4cae2f6c.f9579",\r
+        "id": "f2cac95d.2dd4f",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1134.6452941894531,\r
-        "y": 310.2166442871094,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 352.33331298828125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "eecf5ed7.260848",\r
-                "c7a2a22f.bd7b1",\r
-                "44494afd.f0c474"\r
+                "d39ef031.51bcf8",\r
+                "d0a14c94.f617f8",\r
+                "66ff38b5.215e28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eecf5ed7.260848",\r
+        "id": "d39ef031.51bcf8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1359.6452941894531,\r
-        "y": 168.21664428710938,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 210.33331298828125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "cddb4078.0dee18"\r
+                "6bec9327.9503c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7a2a22f.bd7b1",\r
+        "id": "d0a14c94.f617f8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1355.1362609863281,\r
-        "y": 237.79067993164062,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 279.9073486328125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7789aaf8.1fe7d4"\r
+                "73227915.55ca3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44494afd.f0c474",\r
+        "id": "66ff38b5.215e28",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1343.6452941894531,\r
-        "y": 284.2166442871094,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 326.33331298828125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "64127148.01c618"\r
+                "5c121a7a.2c527c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1679e3cd.763d6c",\r
+        "id": "dcc088f.fb3b378",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
         "x": 1113.6452941894531,\r
-        "y": 198.21664428710938,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 240.33331298828125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47d3b263.d1c534",\r
+        "id": "41a5db6f.16b124",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1101.6452941894531,\r
-        "y": 250.21664428710938,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 292.33331298828125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cddb4078.0dee18",\r
+        "id": "6bec9327.9503c4",\r
         "type": "switchNode",\r
         "name": "switch allotted-resources_length != 0",\r
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1599.8833312988281,\r
-        "y": 164.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 207,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6a54ba66.1cde8c",\r
-                "7bb2b732.d43ff8"\r
+                "52c7d728.b872f8",\r
+                "31624b25.4a6dec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7789aaf8.1fe7d4",\r
+        "id": "73227915.55ca3",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
         "x": 1509.9457092285156,\r
-        "y": 240.74310302734375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 282.8597717285156,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "64127148.01c618",\r
+        "id": "5c121a7a.2c527c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 1513.8833312988281,\r
-        "y": 284.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 327,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a54ba66.1cde8c",\r
+        "id": "52c7d728.b872f8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1804.8833312988281,\r
-        "y": 201.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 244,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d1e88455.43ef2"\r
+                "b08352cf.6ac34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bb2b732.d43ff8",\r
+        "id": "31624b25.4a6dec",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1814.8833312988281,\r
-        "y": 128.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 171,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d1e88455.43ef2",\r
+        "id": "b08352cf.6ac34",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1797.8833312988281,\r
-        "y": 276.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 319,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8390a16b.5a156",\r
-                "341b8f1.ea5ec7",\r
-                "1d2c9241.740b2e",\r
-                "4208fd35.4a6c74",\r
-                "e351db25.84cdc8"\r
+                "bdd428b9.6fddd",\r
+                "8710bcb7.6e657",\r
+                "6f728611.a8a3e",\r
+                "6d42412e.61e8d",\r
+                "e22daf3c.82e7c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2db9f3bd.0d65e4",\r
+        "id": "50e447ae.0fde38",\r
         "type": "save",\r
         "name": "get allotted-resource from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2283.883331298828,\r
-        "y": 327.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 370,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "11f248b6.2b0fe7",\r
-                "fd3681a1.487b1",\r
-                "9338a88f.aebeb"\r
+                "27d61e5e.f12fe2",\r
+                "2c908c8d.59c394",\r
+                "32fadd2c.e0a1c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11f248b6.2b0fe7",\r
+        "id": "27d61e5e.f12fe2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2499.883331298828,\r
-        "y": 394.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 437,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7fe5ebf8.de6a64"\r
+                "4e35bc34.a92d94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd3681a1.487b1",\r
+        "id": "2c908c8d.59c394",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2500.374298095703,\r
-        "y": 294.4573059082031,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 336.573974609375,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6e8f233d.c6dbd4"\r
+                "6fdcac69.b07bec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9338a88f.aebeb",\r
+        "id": "32fadd2c.e0a1c2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2495.883331298828,\r
-        "y": 343.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 386,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8a3025a0.71b76"\r
+                "71176ed6.70694"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8390a16b.5a156",\r
+        "id": "bdd428b9.6fddd",\r
         "type": "for",\r
         "name": "for each allotted-resource",\r
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2000.8833312988281,\r
-        "y": 308.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 351,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7858ac8a.d0ed24",\r
-                "2db9f3bd.0d65e4",\r
-                "98563074.1e7ea",\r
-                "c475408d.68ef"\r
+                "7043f926.26b93",\r
+                "50e447ae.0fde38",\r
+                "8af2638e.140428",\r
+                "b2d6bb83.745318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7858ac8a.d0ed24",\r
+        "id": "7043f926.26b93",\r
         "type": "set",\r
         "name": "set the current allotted-resource-id",\r
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
         "comments": "",\r
         "x": 2280.883331298828,\r
-        "y": 246.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 289,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4208fd35.4a6c74",\r
+        "id": "6d42412e.61e8d",\r
         "type": "set",\r
         "name": "set tmp.arr",\r
         "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",\r
         "comments": "",\r
         "x": 1974.8833312988281,\r
-        "y": 258.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 301,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "341b8f1.ea5ec7",\r
+        "id": "8710bcb7.6e657",\r
         "type": "get-resource",\r
         "name": "get-resource pnfs-list",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2017.8833312988281,\r
-        "y": 117.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 160,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1d2c9241.740b2e",\r
+        "id": "6f728611.a8a3e",\r
         "type": "get-resource",\r
         "name": "get-resource logical-links",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2029.8833312988281,\r
-        "y": 158.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 201,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a3743fb5.49e31",\r
+        "id": "8a5a98d5.6ebb1",\r
         "type": "comment",\r
         "name": "The following two nodes are for PCE",\r
         "info": "",\r
         "comments": "",\r
         "x": 2054.883331298828,\r
-        "y": 70.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 113,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a5956784.1c6ce8",\r
+        "id": "2303563c.e9131a",\r
         "type": "set",\r
         "name": "set tmp.arr",\r
         "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",\r
         "comments": "",\r
         "x": 1974.8833312988281,\r
-        "y": 204.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 247,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e8f233d.c6dbd4",\r
+        "id": "6fdcac69.b07bec",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
         "x": 2678.883331298828,\r
-        "y": 296.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 339,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8a3025a0.71b76",\r
+        "id": "71176ed6.70694",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 2678.820831298828,\r
-        "y": 346.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 388.1402587890625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7fe5ebf8.de6a64",\r
+        "id": "4e35bc34.a92d94",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2680.820831298828,\r
-        "y": 397.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 439.1402587890625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "27474730.1479c8"\r
+                "6a0085f3.85f3dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27474730.1479c8",\r
+        "id": "6a0085f3.85f3dc",\r
         "type": "save",\r
         "name": "get allotted-resource relationship from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2973.820831298828,\r
-        "y": 344.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 386.1402587890625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "bdd221b3.05669",\r
-                "9c61f989.c8eaf8",\r
-                "fabffff4.e28138"\r
+                "47170bd3.47cd24",\r
+                "41231d4a.3c5914",\r
+                "413cb45a.a52f94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c61f989.c8eaf8",\r
+        "id": "41231d4a.3c5914",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3247.311798095703,\r
-        "y": 236.59756469726562,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 278.7142333984375,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "1e4b4cbe.e5dbab"\r
+                "ddcd6972.1cc26"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e4b4cbe.e5dbab",\r
+        "id": "ddcd6972.1cc26",\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": 3424.883331298828,\r
-        "y": 236.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 279,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fabffff4.e28138",\r
+        "id": "413cb45a.a52f94",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3242.820831298828,\r
-        "y": 286.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 328.1402587890625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3e91db11.95e81c"\r
+                "29789682.9a5ca2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e91db11.95e81c",\r
+        "id": "29789682.9a5ca2",\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": 3424.820831298828,\r
-        "y": 286.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 328.1402587890625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bdd221b3.05669",\r
+        "id": "47170bd3.47cd24",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3246.820831298828,\r
-        "y": 337.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 379.1402587890625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8cb6a22.c9637e"\r
+                "5d602163.27f0b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cb6a22.c9637e",\r
+        "id": "5d602163.27f0b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3426.820831298828,\r
-        "y": 337.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 379.1402587890625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6f3506c3.cf97d8"\r
+                "dd9e7161.bb7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f3506c3.cf97d8",\r
+        "id": "dd9e7161.bb7c",\r
         "type": "switchNode",\r
         "name": "switch allotted-resource.relationship-list not empty",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2992.883331298828,\r
-        "y": 471.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 514,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5a58fe79.709e",\r
-                "5401f43b.ed03f4"\r
+                "e567be5f.46cf",\r
+                "117d3c85.14baf3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5401f43b.ed03f4",\r
+        "id": "117d3c85.14baf3",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3302.883331298828,\r
-        "y": 478.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 521,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5a58fe79.709e",\r
+        "id": "e567be5f.46cf",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3301.883331298828,\r
-        "y": 532.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 575,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "126c6f21.417e99"\r
+                "1aa53c9a.ee4c73"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24e00055.8ca808",\r
+        "id": "16e58d5c.45543b",\r
         "type": "outcome",\r
         "name": "network-policy",\r
         "xml": "<outcome value='network-policy'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4046.883331298828,\r
-        "y": 486.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 529,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8c1020d2.e3fc88"\r
+                "e0a75ebb.a4e0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c1020d2.e3fc88",\r
+        "id": "e0a75ebb.a4e0a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4223.883209228516,\r
-        "y": 479.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 521.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "709d8f82.9f2e1",\r
-                "cef8768a.ac6e48"\r
+                "64783b1d.9ea984",\r
+                "aa6dd372.e093d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "126c6f21.417e99",\r
+        "id": "1aa53c9a.ee4c73",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3465.883331298828,\r
-        "y": 458.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 501,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f0253be2.ef6388",\r
-                "d30875df.4619e8"\r
+                "9d9386aa.4ba0f",\r
+                "a5c7d0d0.70a6f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0253be2.ef6388",\r
+        "id": "9d9386aa.4ba0f",\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": 3746.883331298828,\r
-        "y": 414.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 457,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6ce9e370.67b09c"\r
+                "ac9ffe20.350ab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ce9e370.67b09c",\r
+        "id": "ac9ffe20.350ab8",\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": 4008.883331298828,\r
-        "y": 414.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 457,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "24e00055.8ca808"\r
+                "16e58d5c.45543b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "709d8f82.9f2e1",\r
+        "id": "64783b1d.9ea984",\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": 4466.883209228516,\r
-        "y": 436.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 478.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cef8768a.ac6e48",\r
+        "id": "aa6dd372.e093d",\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": 4455.883209228516,\r
-        "y": 491.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 533.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "442d2e35.9513b",\r
-                "6b7a340a.d73c24",\r
-                "1cf09fd1.237e88"\r
+                "a2aec981.c05928",\r
+                "c6a2ea9c.683df",\r
+                "b8928013.256998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cf09fd1.237e88",\r
+        "id": "b8928013.256998",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4708.883331298828,\r
-        "y": 377.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 420,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "830d3a39.a47178"\r
+                "83be4f6.3f006b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "830d3a39.a47178",\r
+        "id": "83be4f6.3f006b",\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": 4857.454864501953,\r
-        "y": 378.1690979003906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 420.2857666015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4e42818f.48a268",\r
+        "id": "586d6db7.c2d804",\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": 4856.392364501953,\r
-        "y": 422.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 464.426025390625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6b7a340a.d73c24",\r
+        "id": "c6a2ea9c.683df",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4697.392364501953,\r
-        "y": 422.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 464.426025390625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "4e42818f.48a268"\r
+                "586d6db7.c2d804"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "442d2e35.9513b",\r
+        "id": "a2aec981.c05928",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4704.392364501953,\r
-        "y": 501.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 543.426025390625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "dd05e839.54d638"\r
+                "4d4b39ee.fece78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd05e839.54d638",\r
+        "id": "4d4b39ee.fece78",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4843.392364501953,\r
-        "y": 501.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 543.426025390625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d5c9a2a0.f0c188",\r
-                "585ee28c.970d44"\r
+                "68714312.362fe4",\r
+                "860808d4.582b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5c9a2a0.f0c188",\r
+        "id": "68714312.362fe4",\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": 5048.883331298828,\r
-        "y": 498.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 541,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "585ee28c.970d44",\r
+        "id": "860808d4.582b4",\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": 5047.883331298828,\r
-        "y": 544.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 587,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d30875df.4619e8",\r
+        "id": "a5c7d0d0.70a6f8",\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": 3563.883331298828,\r
-        "y": 530.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 573,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "bcf8f8b2.ee17c"\r
+                "91204981.e8b1c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcf8f8b2.ee17c",\r
+        "id": "91204981.e8b1c8",\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": 3843.883331298828,\r
-        "y": 530.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 573,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f92213c8.e6e61"\r
+                "815c7496.5664a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f92213c8.e6e61",\r
+        "id": "815c7496.5664a8",\r
         "type": "outcome",\r
         "name": "logical-link",\r
         "xml": "<outcome value='logical-link'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2256.8834533691406,\r
-        "y": 783.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 826.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f147a584.43d0d8"\r
+                "2e1a5e6a.390622"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f147a584.43d0d8",\r
+        "id": "2e1a5e6a.390622",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2433.883331298828,\r
-        "y": 776.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 819,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5a35df58.3972",\r
-                "2dab28b6.2641a"\r
+                "fda12a63.354948",\r
+                "9acb494f.3c831"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a35df58.3972",\r
+        "id": "fda12a63.354948",\r
         "type": "set",\r
         "name": "set the current logical-link-name",\r
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
         "comments": "",\r
         "x": 2676.883331298828,\r
-        "y": 733.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 776,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2dab28b6.2641a",\r
+        "id": "9acb494f.3c831",\r
         "type": "save",\r
         "name": "get logical-link from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2665.883331298828,\r
-        "y": 788.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 831,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ffb30860.4224d",\r
-                "abeb5cc2.3015b",\r
-                "e13761ad.544c58"\r
+                "2cf3e7af.84ed7",\r
+                "7720ff91.14ecb8",\r
+                "6208751c.cb4214"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffb30860.4224d",\r
+        "id": "2cf3e7af.84ed7",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2957.374298095703,\r
-        "y": 767.4573059082031,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 809.573974609375,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "bd849955.1204b"\r
+                "644aada5.da5074"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abeb5cc2.3015b",\r
+        "id": "7720ff91.14ecb8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2945.883331298828,\r
-        "y": 811.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 854,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "33701bc2.b5a40c"\r
+                "b4b18b88.8b8778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd849955.1204b",\r
+        "id": "644aada5.da5074",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
         "x": 3105.945831298828,\r
-        "y": 767.7430725097656,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 809.8597412109375,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "33701bc2.b5a40c",\r
+        "id": "b4b18b88.8b8778",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3104.883331298828,\r
-        "y": 811.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 854,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e13761ad.544c58",\r
+        "id": "6208751c.cb4214",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2952.883331298828,\r
-        "y": 890.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 933,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d2f3b92.5263348"\r
+                "f4a1f138.8436a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2f3b92.5263348",\r
+        "id": "f4a1f138.8436a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3091.883331298828,\r
-        "y": 890.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 933,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ef467ac0.6f7c18",\r
-                "f9d1859a.061ab8",\r
-                "3e963f23.c2be88",\r
-                "f9ae4741.757498",\r
-                "2907fb26.565cec",\r
-                "26f3b8c8.1692a",\r
-                "94a806e9.b63df",\r
-                "a001cedc.58f128",\r
-                "221f1c18.663f6c",\r
-                "77955a17.d633ac",\r
-                "1e4146ab.95c211",\r
-                "c8da4017.620ba8",\r
-                "a4dfc5e6.4600f",\r
-                "ce0d81bd.d28a7",\r
-                "7f04acf4.5afc3c"\r
+                "64b776d1.df13b8",\r
+                "cf58d1a3.b75bc8",\r
+                "a4d7ff96.ceb5f8",\r
+                "4f57fa4.5908a84",\r
+                "93281de6.9193c8",\r
+                "279a0c66.95b87c",\r
+                "2fd6be0.ec30642",\r
+                "3458f9fd.a9fdce",\r
+                "b114579a.337d4",\r
+                "83634982.62f32",\r
+                "a78c5989.f5207",\r
+                "dc895d5a.f09ef",\r
+                "8c6f82a5.234d18",\r
+                "a984d0c7.8574d",\r
+                "49347bae.3e2974"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4165b419.5fd914",\r
+        "id": "fe79d8e9.168438",\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": 3405.883331298828,\r
-        "y": 696.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 739,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ef467ac0.6f7c18",\r
+        "id": "64b776d1.df13b8",\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": 3386.883331298828,\r
-        "y": 746.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 789,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c8da4017.620ba8",\r
+        "id": "dc895d5a.f09ef",\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": 3343.883331298828,\r
-        "y": 791.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 834,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f9d1859a.061ab8",\r
+        "id": "cf58d1a3.b75bc8",\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": 3318.883331298828,\r
-        "y": 854.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 897,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e963f23.c2be88",\r
+        "id": "a4d7ff96.ceb5f8",\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": 3319.883331298828,\r
-        "y": 909.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 952,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f9ae4741.757498",\r
+        "id": "4f57fa4.5908a84",\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": 3335.883331298828,\r
-        "y": 957.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1000,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d029c3a1.942f48",\r
-                "34db9b18.f85a0c",\r
-                "a8f47dda.1a0bb8"\r
+                "722a434e.2a3adc",\r
+                "e8fe3cd4.c3586",\r
+                "fdbfe007.1ea3b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2907fb26.565cec",\r
+        "id": "93281de6.9193c8",\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": 3324.883331298828,\r
-        "y": 1044.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1086.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ad570631.23385",\r
-                "75596bb2.8de11c",\r
-                "ae6194f6.92ada8"\r
+                "b372ac3d.0a4b1",\r
+                "d24aa16b.e47da",\r
+                "419032bc.a4963c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d029c3a1.942f48",\r
+        "id": "722a434e.2a3adc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3536.883331298828,\r
-        "y": 841.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 884,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9c52bc0.78abb48"\r
+                "aae0d761.ec3158"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34db9b18.f85a0c",\r
+        "id": "e8fe3cd4.c3586",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3532.392364501953,\r
-        "y": 891.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 933.426025390625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "946c30bd.bd527"\r
+                "af62b91c.6bf638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8f47dda.1a0bb8",\r
+        "id": "fdbfe007.1ea3b",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3536.392364501953,\r
-        "y": 944.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 986.426025390625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "1dcb46a1.3c7d49"\r
+                "72360610.10f7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c52bc0.78abb48",\r
+        "id": "aae0d761.ec3158",\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": 3685.454864501953,\r
-        "y": 841.1690979003906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 883.2857666015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "946c30bd.bd527",\r
+        "id": "af62b91c.6bf638",\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": 3675.392364501953,\r
-        "y": 891.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 933.426025390625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad570631.23385",\r
+        "id": "b372ac3d.0a4b1",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3547.883331298828,\r
-        "y": 1014.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1056.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5f295173.cbbf5"\r
+                "3bdfccb0.f2d08c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75596bb2.8de11c",\r
+        "id": "d24aa16b.e47da",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3543.392364501953,\r
-        "y": 1064.3092346191406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1106.4259033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "355d767e.1de55a"\r
+                "57f2def1.81f4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae6194f6.92ada8",\r
+        "id": "419032bc.a4963c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3544.392364501953,\r
-        "y": 1117.3092346191406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1159.4259033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "a436621f.a466c"\r
+                "91fe26d2.5b80d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f295173.cbbf5",\r
+        "id": "3bdfccb0.f2d08c",\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": 3696.454864501953,\r
-        "y": 1014.1689758300781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1056.28564453125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "355d767e.1de55a",\r
+        "id": "57f2def1.81f4e",\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": 3686.392364501953,\r
-        "y": 1064.3092346191406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1106.4259033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1dcb46a1.3c7d49",\r
+        "id": "72360610.10f7e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3697.883331298828,\r
-        "y": 943.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 986,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f5b5d495.086d"\r
+                "21ff581a.7d3f68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a436621f.a466c",\r
+        "id": "91fe26d2.5b80d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3697.883331298828,\r
-        "y": 1116.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1158.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "43e5bf6b.ff29a8"\r
+                "f4949055.0aa838"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5b5d495.086d",\r
+        "id": "21ff581a.7d3f68",\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": 3869.883331298828,\r
-        "y": 943.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 986,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "55f80e1b.2635f",\r
-                "43049869.5a7d88"\r
+                "d771576e.5459b",\r
+                "743ce77.86c2e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43e5bf6b.ff29a8",\r
+        "id": "f4949055.0aa838",\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": 3870.883331298828,\r
-        "y": 1116.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1159,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f9772113.de9e58",\r
-                "79517b7a.195d94"\r
+                "854204ac.64311",\r
+                "5401ccd6.c2c2e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55f80e1b.2635f",\r
+        "id": "d771576e.5459b",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4045.883331298828,\r
-        "y": 922.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 965,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d9c9bf69.d54ef8"\r
+                "2e04d27d.5faff6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43049869.5a7d88",\r
+        "id": "743ce77.86c2e98",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4047.883331298828,\r
-        "y": 976.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1019,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5ac63627.c33ff"\r
+                "12c64a9b.27d615"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9772113.de9e58",\r
+        "id": "854204ac.64311",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4046.883331298828,\r
-        "y": 1086.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1129,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "35523eeb.15287a"\r
+                "a8347389.2ab3b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79517b7a.195d94",\r
+        "id": "5401ccd6.c2c2e4",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4048.883331298828,\r
-        "y": 1140.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1183,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "377b88b8.aaeb48"\r
+                "49b6f3ad.a55ac4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eba0d9fe.14aff8",\r
+        "id": "20ddeea0.a0e9ea",\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": 4355.883331298828,\r
-        "y": 874.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 917,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b156164c.4afee",\r
+        "id": "a4916484.b95cf",\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": 4348.883331298828,\r
-        "y": 972.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1015,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c46834b2.126828",\r
+        "id": "2f347429.e690cc",\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": 4348.883331298828,\r
-        "y": 1059.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1102,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67f1e499.325a54",\r
+        "id": "cad2e783.60fc68",\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": 4352.883331298828,\r
-        "y": 1152.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1195,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa18abdb.1f3b58",\r
+        "id": "b1d86e33.3aa378",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3579.883331298828,\r
-        "y": 1561.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1604,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "acfe7f1b.815bb8"\r
+                "a5f9a85c.99ac48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "504369a4.383c58",\r
+        "id": "a4982a5c.ee1f08",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3589.374298095703,\r
-        "y": 1604.4573669433594,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1646.5740356445312,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2cc2d2a0.0189de"\r
+                "bbb83480.f4afb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48dc6834.fa2a",\r
+        "id": "9afba595.5831a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3577.883331298828,\r
-        "y": 1650.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1693,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5165f4d1.561cf4"\r
+                "eeac5d42.037ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5821370.c906a8",\r
+        "id": "a9f44662.0eb94",\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": 3279.883331298828,\r
-        "y": 1523.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1566,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "94a806e9.b63df",\r
+        "id": "2fd6be0.ec30642",\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": 3322.883331298828,\r
-        "y": 1588.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1631,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fa18abdb.1f3b58",\r
-                "504369a4.383c58",\r
-                "48dc6834.fa2a"\r
+                "b1d86e33.3aa378",\r
+                "a4982a5c.ee1f08",\r
+                "9afba595.5831a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26f3b8c8.1692a",\r
+        "id": "279a0c66.95b87c",\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": 3323.883331298828,\r
-        "y": 1258.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1301,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e1766e3b.d98f7",\r
-                "2b2fec17.7ad784"\r
+                "ab7f6387.a06298",\r
+                "178d0fab.57c17"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b2fec17.7ad784",\r
+        "id": "178d0fab.57c17",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3546.883331298828,\r
-        "y": 1244.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1287,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9fa24ca4.2bf57"\r
+                "174b650f.6f4cdb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1766e3b.d98f7",\r
+        "id": "ab7f6387.a06298",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3548.883331298828,\r
-        "y": 1277.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1320,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "43f11543.33be3c"\r
+                "109222da.cab295"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "acfe7f1b.815bb8",\r
+        "id": "a5f9a85c.99ac48",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3752.549835205078,\r
-        "y": 1560.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1603,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "72fd24ba.a9210c",\r
-                "abb77544.4a8348"\r
+                "f0dfffc5.29d178",\r
+                "acd2704e.4ae308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cc2d2a0.0189de",\r
+        "id": "bbb83480.f4afb8",\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": 3742.9457092285156,\r
-        "y": 1607.7431030273438,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1649.8597717285156,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5165f4d1.561cf4",\r
+        "id": "eeac5d42.037ff",\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": 3746.883331298828,\r
-        "y": 1651.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1694,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "72fd24ba.a9210c",\r
+        "id": "f0dfffc5.29d178",\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": 4016.883331298828,\r
-        "y": 1544.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1587,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e6b87836.bef2f8",\r
-                "b8a921ef.444378"\r
+                "11bdf0f4.508487",\r
+                "23d1e1ad.23f75e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8a921ef.444378",\r
+        "id": "23d1e1ad.23f75e",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4239.883331298828,\r
-        "y": 1499.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1542,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "54ec9e81.9a2fc"\r
+                "3fc7a366.f1683c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6b87836.bef2f8",\r
+        "id": "11bdf0f4.508487",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4241.883331298828,\r
-        "y": 1563.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1606,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "27ce4c05.8bf1dc"\r
+                "d6cac3a3.d1f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27ce4c05.8bf1dc",\r
+        "id": "d6cac3a3.d1f4",\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": 4403.883331298828,\r
-        "y": 1559.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1602,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "54ec9e81.9a2fc",\r
+        "id": "3fc7a366.f1683c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4404.883331298828,\r
-        "y": 1496.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1539,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f6774ff2.abd22",\r
-                "bb24ac55.01a618"\r
+                "d54289dc.18d288",\r
+                "cc99bc89.a9c058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e1ea98e.240716",\r
+        "id": "17e0fd07.b5de8b",\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\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4018.883331298828,\r
-        "y": 1703.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1746,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "19e24364.492f0d",\r
+        "id": "f1afd056.64d73",\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": 4063.883331298828,\r
-        "y": 1613.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1656,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "aefdb41a.15ed9",\r
+        "id": "50d51c8c.dc95ac",\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": 4146.883331298828,\r
-        "y": 1751.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1794,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "43f11543.33be3c",\r
+        "id": "109222da.cab295",\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": 3691.883331298828,\r
-        "y": 1274.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1317,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9fa24ca4.2bf57",\r
+        "id": "174b650f.6f4cdb",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3694.883331298828,\r
-        "y": 1237.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1280,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fc422c00.a0a738",\r
-                "4c9af5cc.7cdc6c"\r
+                "6b9c6245.ea050c",\r
+                "ab33cb14.ff6cc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc422c00.a0a738",\r
+        "id": "6b9c6245.ea050c",\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": 3868.883331298828,\r
-        "y": 1193.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1236,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "abb77544.4a8348",\r
+        "id": "acd2704e.4ae308",\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": 3970.883331298828,\r
-        "y": 1828.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1871,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "af71b606.ad1ca8"\r
+                "73a0105b.ac0e58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af71b606.ad1ca8",\r
+        "id": "73a0105b.ac0e58",\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": 4176.883331298828,\r
-        "y": 1828.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1871,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "1586191.cb5c467"\r
+                "6dbfb157.d8359"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1586191.cb5c467",\r
+        "id": "6dbfb157.d8359",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4392.168975830078,\r
-        "y": 1828.7051086425781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1870.82177734375,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2efd1433.a69a04"\r
+                "616def67.e5a25"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c9af5cc.7cdc6c",\r
+        "id": "ab33cb14.ff6cc8",\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": 3883.883331298828,\r
-        "y": 1304.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1347,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f48c8915.33d9e8",\r
-                "cce55dcf.842618",\r
-                "5e74a015.2ca67"\r
+                "e7bde0a4.3a223",\r
+                "856b3a3e.33dd18",\r
+                "ec1837c2.7e65e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f48c8915.33d9e8",\r
+        "id": "e7bde0a4.3a223",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4079.3834533691406,\r
-        "y": 1256.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1299,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5a7d862f.3b4ad8"\r
+                "a049038b.508d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cce55dcf.842618",\r
+        "id": "856b3a3e.33dd18",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4071.3834533691406,\r
-        "y": 1311.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1354,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9061c72.32ffe38"\r
+                "f843f7f2.8c64b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e74a015.2ca67",\r
+        "id": "ec1837c2.7e65e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4076.3834533691406,\r
-        "y": 1368.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1411,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6b55247c.21dab4"\r
+                "47e459e1.2a9ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b55247c.21dab4",\r
+        "id": "47e459e1.2a9ce",\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": 4228.383453369141,\r
-        "y": 1369.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1412,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9061c72.32ffe38",\r
+        "id": "f843f7f2.8c64b8",\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": 4239.383453369141,\r
-        "y": 1314.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1357,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5a7d862f.3b4ad8",\r
+        "id": "a049038b.508d4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4223.765777587891,\r
-        "y": 1254.5390014648438,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1296.6556701660156,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d89a976.d88e5e8"\r
+                "b2d1999f.753708"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d89a976.d88e5e8",\r
+        "id": "b2d1999f.753708",\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": 4407.883331298828,\r
-        "y": 1268.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1311,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "155fb221.0dbf8e"\r
+                "9b22416d.9cdac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb24ac55.01a618",\r
+        "id": "cc99bc89.a9c058",\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": 4574.883331298828,\r
-        "y": 1454.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1497,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f6774ff2.abd22",\r
+        "id": "d54289dc.18d288",\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": 4575.883331298828,\r
-        "y": 1562.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1605,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1f2d63dd.89956c",\r
+        "id": "46e18359.07aad4",\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": 4576.883331298828,\r
-        "y": 1511.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1554,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2efd1433.a69a04",\r
+        "id": "616def67.e5a25",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4599.000518798828,\r
-        "y": 1829.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1871.34033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9738e3.11ec3f2",\r
-                "b90b51f7.bc063",\r
-                "e565f202.9406"\r
+                "6d0c5fcb.438328",\r
+                "40a1c35d.17991c",\r
+                "6c800e67.6aa9c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9738e3.11ec3f2",\r
+        "id": "6d0c5fcb.438328",\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": 4814.000518798828,\r
-        "y": 1791.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1833.34033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b90b51f7.bc063",\r
+        "id": "40a1c35d.17991c",\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": 4811.000518798828,\r
-        "y": 1830.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1872.34033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2d0e3a15.1426a6"\r
+                "9de28790.cf8c7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e565f202.9406",\r
+        "id": "6c800e67.6aa9c8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4766.500518798828,\r
-        "y": 1872.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1914.34033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d0e3a15.1426a6",\r
+        "id": "9de28790.cf8c7",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4991.500518798828,\r
-        "y": 1829.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1871.34033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "a863747c.f65e78"\r
+                "e5173d49.fc3368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60c94053.2751c",\r
+        "id": "376d58a4.adb2a",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4805.883331298828,\r
-        "y": 1272.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1315,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "de3b61b0.e43d2"\r
+                "60247fbe.4b6c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de3b61b0.e43d2",\r
+        "id": "60247fbe.4b6c2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4982.883331298828,\r
-        "y": 1264.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1307,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b2f44bdb.9dc5e8",\r
-                "1f8e5eff.5b4f51"\r
+                "4270b940.4f6ac",\r
+                "65b48891.d54c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "155fb221.0dbf8e",\r
+        "id": "9b22416d.9cdac8",\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": 4602.883331298828,\r
-        "y": 1268.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1311,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "60c94053.2751c",\r
-                "ecc099ad.aafee8"\r
+                "376d58a4.adb2a",\r
+                "59d37917.573538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ecc099ad.aafee8",\r
+        "id": "59d37917.573538",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4808.883331298828,\r
-        "y": 1346.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1389,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e5e04393.9d571"\r
+                "b8751b8b.fb4f58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5e04393.9d571",\r
+        "id": "b8751b8b.fb4f58",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4985.883331298828,\r
-        "y": 1338.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1381,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "39969cdd.a78634"\r
+                "673e159e.9038cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a863747c.f65e78",\r
+        "id": "e5173d49.fc3368",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5149.500518798828,\r
-        "y": 1829.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1871.34033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9ec1944.f167b68"\r
+                "e816a090.0c423"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ec1944.f167b68",\r
+        "id": "e816a090.0c423",\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": 5356.500518798828,\r
-        "y": 1829.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1871.34033203125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1f8e5eff.5b4f51",\r
+        "id": "65b48891.d54c3",\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": 5190.883331298828,\r
-        "y": 1271.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1314,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "1422dd1f.ed1903",\r
-                "306288e7.8d0b68",\r
-                "adc4d006.c9a618"\r
+                "12ca2f18.a3fcb1",\r
+                "2eff6a6f.1256be",\r
+                "ae932fb7.b2f368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2f44bdb.9dc5e8",\r
+        "id": "4270b940.4f6ac",\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": 5220.883331298828,\r
-        "y": 1219.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1262,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1422dd1f.ed1903",\r
+        "id": "12ca2f18.a3fcb1",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5400.883331298828,\r
-        "y": 1262.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1305,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9be58098.9885c8"\r
+                "19df6125.66c90f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "306288e7.8d0b68",\r
+        "id": "2eff6a6f.1256be",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5392.883331298828,\r
-        "y": 1317.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1360,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ddbc66fb.291808"\r
+                "5900b30a.9db0cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adc4d006.c9a618",\r
+        "id": "ae932fb7.b2f368",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5397.883331298828,\r
-        "y": 1374.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1417,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f026a629.a20b28"\r
+                "abcfe080.ae7e7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f026a629.a20b28",\r
+        "id": "abcfe080.ae7e7",\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": 5549.883331298828,\r
-        "y": 1375.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1418,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ddbc66fb.291808",\r
+        "id": "5900b30a.9db0cc",\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": 5560.883331298828,\r
-        "y": 1320.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1363,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9be58098.9885c8",\r
+        "id": "19df6125.66c90f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5545.265655517578,\r
-        "y": 1260.5390014648438,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1302.6556701660156,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b1324a29.092c8"\r
+                "db94bf6b.c81da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39969cdd.a78634",\r
+        "id": "673e159e.9038cc",\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": 5220.883331298828,\r
-        "y": 1462.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1505,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1324a29.092c8",\r
+        "id": "db94bf6b.c81da8",\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": 5759.883331298828,\r
-        "y": 1256.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1299,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e7c33475.7e91e8",\r
+        "id": "653ea460.331594",\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": 4343.883331298828,\r
-        "y": 910.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 953,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5025b50.00b0f4c",\r
+        "id": "3ff377ce.541508",\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": 4334.883331298828,\r
-        "y": 1008.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1051,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d9c9bf69.d54ef8",\r
+        "id": "2e04d27d.5faff6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4168.883331298828,\r
-        "y": 916.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 959,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "eba0d9fe.14aff8",\r
-                "e7c33475.7e91e8"\r
+                "20ddeea0.a0e9ea",\r
+                "653ea460.331594"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ac63627.c33ff",\r
+        "id": "12c64a9b.27d615",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4174.883331298828,\r
-        "y": 980.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1023,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b156164c.4afee",\r
-                "5025b50.00b0f4c"\r
+                "a4916484.b95cf",\r
+                "3ff377ce.541508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "35523eeb.15287a",\r
+        "id": "a8347389.2ab3b",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4174.883331298828,\r
-        "y": 1086.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1129,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "c46834b2.126828",\r
-                "7dcc31dd.14e278"\r
+                "2f347429.e690cc",\r
+                "64f47a9a.5541ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "377b88b8.aaeb48",\r
+        "id": "49b6f3ad.a55ac4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4177.883331298828,\r
-        "y": 1139.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1182,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "67f1e499.325a54",\r
-                "e00fdb48.f91848"\r
+                "cad2e783.60fc68",\r
+                "93b1477b.b7ce28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7dcc31dd.14e278",\r
+        "id": "64f47a9a.5541ec",\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": 4334.883331298828,\r
-        "y": 1099.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1142,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e00fdb48.f91848",\r
+        "id": "93b1477b.b7ce28",\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": 4337.883331298828,\r
-        "y": 1190.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1233,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1c3c9b6.d1dd38",\r
+        "id": "bcceae66.215ea8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3709.883331298828,\r
-        "y": 2400.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2443,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8d971e70.183d4",\r
-                "ac7f0ae7.0820f"\r
+                "fa55cad.2f0ddb8",\r
+                "341eac77.d5f56c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37cdc12f.574c9e",\r
+        "id": "e6e2e92d.d49f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3537.216827392578,\r
-        "y": 2401.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2444,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b1c3c9b6.d1dd38"\r
+                "bcceae66.215ea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17fb9abf.e94b5d",\r
+        "id": "15d49e8e.f5c6d1",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3546.707794189453,\r
-        "y": 2444.4573669433594,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2486.5740356445312,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ffec1f14.6b38f8"\r
+                "b6575c89.a4dbd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77126cff.9c26a4",\r
+        "id": "456db0bd.6c4e5",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3535.216827392578,\r
-        "y": 2490.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2533,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6fe13c0.1437ac4"\r
+                "f1a4c78.c749938"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffec1f14.6b38f8",\r
+        "id": "b6575c89.a4dbd8",\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": 3700.2792053222656,\r
-        "y": 2447.7431030273438,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2489.8597717285156,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6fe13c0.1437ac4",\r
+        "id": "f1a4c78.c749938",\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": 3704.216827392578,\r
-        "y": 2491.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2534,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d971e70.183d4",\r
+        "id": "fa55cad.2f0ddb8",\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": 3996.216827392578,\r
-        "y": 2404.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2447.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "53133799.37d4b",\r
-                "a86f569d.6ab9f8"\r
+                "2a55ff3d.a63f58",\r
+                "a4fedadd.ffdcf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a86f569d.6ab9f8",\r
+        "id": "a4fedadd.ffdcf",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4219.216827392578,\r
-        "y": 2359.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2402.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "66c68013.ddb6b8"\r
+                "2cf5b91c.330536"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53133799.37d4b",\r
+        "id": "2a55ff3d.a63f58",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4221.216827392578,\r
-        "y": 2423.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2466.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7ccc7afc.6f2a8c"\r
+                "f4cfd006.4df4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ccc7afc.6f2a8c",\r
+        "id": "f4cfd006.4df4a",\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": 4380.216827392578,\r
-        "y": 2442.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2485.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66c68013.ddb6b8",\r
+        "id": "2cf5b91c.330536",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4384.216827392578,\r
-        "y": 2356.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2399.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "14b7c942.3a7d87",\r
-                "705ad60b.9c1b38"\r
+                "60521985.bf9fa8",\r
+                "1b11d7f2.c04e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b364584.e1350c",\r
+        "id": "3e3a2fcb.29b168",\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<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3998.216827392578,\r
-        "y": 2563.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2606.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2e817e1e.7658f2",\r
+        "id": "a24d2064.f8a7c",\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": 4043.216827392578,\r
-        "y": 2473.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2516.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1f716896.64ed2f",\r
+        "id": "7f1c08c8.8cc28",\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": 4125.216827392578,\r
-        "y": 2628.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2671.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "221f1c18.663f6c",\r
+        "id": "b114579a.337d4",\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": 3309.216827392578,\r
-        "y": 2436.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2479,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "37cdc12f.574c9e",\r
-                "17fb9abf.e94b5d",\r
-                "77126cff.9c26a4"\r
+                "e6e2e92d.d49f8",\r
+                "15d49e8e.f5c6d1",\r
+                "456db0bd.6c4e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3b2ce86.7d813",\r
+        "id": "8e0a6f3b.01feb",\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": 3270.216827392578,\r
-        "y": 2380.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2423,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a001cedc.58f128",\r
+        "id": "3458f9fd.a9fdce",\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": 3327.216827392578,\r
-        "y": 2099.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2141.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d5568173.1326d",\r
-                "27e39e34.e8a4aa"\r
+                "c48f1e5.b50d76",\r
+                "40db2833.3d6058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27e39e34.e8a4aa",\r
+        "id": "40db2833.3d6058",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3550.216827392578,\r
-        "y": 2085.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2127.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ba49d8fd.b81698"\r
+                "57ecc3e9.705994"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5568173.1326d",\r
+        "id": "c48f1e5.b50d76",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3552.216827392578,\r
-        "y": 2118.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2160.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "54689cfb.423da4"\r
+                "6a189760.03fff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54689cfb.423da4",\r
+        "id": "6a189760.03fff",\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": 3695.216827392578,\r
-        "y": 2115.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2157.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba49d8fd.b81698",\r
+        "id": "57ecc3e9.705994",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3698.216827392578,\r
-        "y": 2078.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2120.9998779296875,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e65b9c6b.1cea38",\r
-                "e0207e5b.773f7"\r
+                "7ef10f50.4a98b",\r
+                "d3e48892.7c0638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e65b9c6b.1cea38",\r
+        "id": "7ef10f50.4a98b",\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": 3892.216827392578,\r
-        "y": 2081.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2124,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac7f0ae7.0820f",\r
+        "id": "341eac77.d5f56c",\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": 3955.216827392578,\r
-        "y": 2713.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2756,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "eb66de49.8a6178"\r
+                "1d1b2999.e8eaf6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb66de49.8a6178",\r
+        "id": "1d1b2999.e8eaf6",\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": 4161.216827392578,\r
-        "y": 2713.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2756,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "a3eb7777.2808e"\r
+                "2587a419.edf304"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3eb7777.2808e",\r
+        "id": "2587a419.edf304",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4378.502471923828,\r
-        "y": 2712.705108642578,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2754.82177734375,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "90bfeab5.6e04"\r
+                "596e064d.3e4868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0207e5b.773f7",\r
+        "id": "d3e48892.7c0638",\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": 3914.216827392578,\r
-        "y": 2149.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2192,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ff3d2407.61718",\r
-                "f34e14e1.674a08",\r
-                "f7ebc3eb.0fe87"\r
+                "5d04022c.52094c",\r
+                "4363a204.88356c",\r
+                "d1632f49.e8bfd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff3d2407.61718",\r
+        "id": "5d04022c.52094c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4109.716949462891,\r
-        "y": 2101.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2144,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e4f3177f.7fd418"\r
+                "16d6f161.b988af"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f34e14e1.674a08",\r
+        "id": "4363a204.88356c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4101.716949462891,\r
-        "y": 2156.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2199,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7e75e0e1.a6768"\r
+                "5ac71d3b.31ff94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7ebc3eb.0fe87",\r
+        "id": "d1632f49.e8bfd8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4106.716949462891,\r
-        "y": 2213.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2256,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "917fd40f.ec43b"\r
+                "8e2e62d9.6dcb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "917fd40f.ec43b",\r
+        "id": "8e2e62d9.6dcb8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 4258.716949462891,\r
-        "y": 2214.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2257,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7e75e0e1.a6768",\r
+        "id": "5ac71d3b.31ff94",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 4269.716949462891,\r
-        "y": 2159.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2202,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4f3177f.7fd418",\r
+        "id": "16d6f161.b988af",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4254.099273681641,\r
-        "y": 2099.5390014648438,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2141.6556701660156,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "96db4a5c.6d74f"\r
+                "7d886bfd.e9ca4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14b7c942.3a7d87",\r
+        "id": "60521985.bf9fa8",\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": 4554.216827392578,\r
-        "y": 2317.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2360.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "705ad60b.9c1b38",\r
+        "id": "1b11d7f2.c04e4",\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": 4555.216827392578,\r
-        "y": 2422.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2465.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe24857d.ec88f8",\r
+        "id": "f5d8e7ee.5dd5b8",\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": 4550.216827392578,\r
-        "y": 2371.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2414.0001220703125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "90bfeab5.6e04",\r
+        "id": "596e064d.3e4868",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4585.334014892578,\r
-        "y": 2702.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2744.3404541015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d29ec4c3.e3026",\r
-                "3dd34bd3.f84b34",\r
-                "855f6bda.886bb"\r
+                "1d1ef4b9.b52cc3",\r
+                "aa09325d.47c72",\r
+                "f212860e.85526"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d29ec4c3.e3026",\r
+        "id": "1d1ef4b9.b52cc3",\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": 4800.334014892578,\r
-        "y": 2664.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2706.3404541015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3dd34bd3.f84b34",\r
+        "id": "aa09325d.47c72",\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": 4797.334014892578,\r
-        "y": 2703.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2745.3404541015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "498fc826.7744e"\r
+                "391393be.95d72c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "855f6bda.886bb",\r
+        "id": "f212860e.85526",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4752.834014892578,\r
-        "y": 2745.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2787.3404541015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "498fc826.7744e",\r
+        "id": "391393be.95d72c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4977.834014892578,\r
-        "y": 2702.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2744.3404541015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3dffa556.ecd0ba"\r
+                "520819a9.ab1618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3dffa556.ecd0ba",\r
+        "id": "520819a9.ab1618",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5135.834014892578,\r
-        "y": 2702.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2744.3404541015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e57a350c.677e18"\r
+                "3a6f0d92.f64ee2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e57a350c.677e18",\r
+        "id": "3a6f0d92.f64ee2",\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": 5342.834014892578,\r
-        "y": 2702.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2744.3404541015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "321528be.3d7ae",\r
+        "id": "35d3101c.ddb4c",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4836.216827392578,\r
-        "y": 2117.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2160,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e56d9c92.9b763"\r
+                "461a66b2.13a6c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e56d9c92.9b763",\r
+        "id": "461a66b2.13a6c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5013.216827392578,\r
-        "y": 2109.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2152,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "251b7dfd.9c2dea",\r
-                "f747044b.58f4e"\r
+                "6cbb0705.4a3c5",\r
+                "670f0182.9fd968"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96db4a5c.6d74f",\r
+        "id": "7d886bfd.e9ca4c",\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": 4438.216827392578,\r
-        "y": 2113.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2156,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3dedc7fb.152e08"\r
+                "e2222250.60ef7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3dedc7fb.152e08",\r
+        "id": "e2222250.60ef7",\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": 4633.216827392578,\r
-        "y": 2113.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2156,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "321528be.3d7ae",\r
-                "b22cff66.f669e8"\r
+                "35d3101c.ddb4c",\r
+                "768c39b6.117ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f747044b.58f4e",\r
+        "id": "670f0182.9fd968",\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": 5221.216827392578,\r
-        "y": 2116.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2159,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "1f813de4.828122",\r
-                "d83bccad.38e8b8",\r
-                "c46088f8.fb1e"\r
+                "4e714dda.e8064c",\r
+                "6d43e638.f020f8",\r
+                "33cdbe70.d704f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd687e81.f269c8",\r
+        "id": "9bab22e5.a35978",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5015.216827392578,\r
-        "y": 2182.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2225,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "44576406.503604"\r
+                "3c5a22cd.c5b5a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b22cff66.f669e8",\r
+        "id": "768c39b6.117ae",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4838.216827392578,\r
-        "y": 2190.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2233,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "cd687e81.f269c8"\r
+                "9bab22e5.a35978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "251b7dfd.9c2dea",\r
+        "id": "6cbb0705.4a3c5",\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": 5251.216827392578,\r
-        "y": 2064.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2107,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44576406.503604",\r
+        "id": "3c5a22cd.c5b5a6",\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": 5250.216827392578,\r
-        "y": 2306.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2349,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1f813de4.828122",\r
+        "id": "4e714dda.e8064c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5431.216827392578,\r
-        "y": 2107.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2150,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9f1d5683.34bf48"\r
+                "c3b341d5.27524"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d83bccad.38e8b8",\r
+        "id": "6d43e638.f020f8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5423.216827392578,\r
-        "y": 2162.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2205,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3d8c6a19.63c47e"\r
+                "5319e635.03496"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c46088f8.fb1e",\r
+        "id": "33cdbe70.d704f2",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5428.216827392578,\r
-        "y": 2219.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2262,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "868d602e.d270d8"\r
+                "bf85165f.b30b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "868d602e.d270d8",\r
+        "id": "bf85165f.b30b4",\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": 5580.216827392578,\r
-        "y": 2220.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2263,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d8c6a19.63c47e",\r
+        "id": "5319e635.03496",\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": 5591.216827392578,\r
-        "y": 2165.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2208,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f1d5683.34bf48",\r
+        "id": "c3b341d5.27524",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5575.599151611328,\r
-        "y": 2105.5390014648438,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2147.6556701660156,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "580e8311.7470f4"\r
+                "5a4d43b1.7dbc0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "580e8311.7470f4",\r
+        "id": "5a4d43b1.7dbc0c",\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": 5790.216827392578,\r
-        "y": 2101.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2144,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "77955a17.d633ac",\r
+        "id": "83634982.62f32",\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`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",\r
         "comments": "",\r
         "x": 3288.883331298828,\r
-        "y": 1711.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1754,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "88408865.7d27f8",\r
+        "id": "51304efd.d01998",\r
         "type": "comment",\r
         "name": "This is it (should be)",\r
         "info": "",\r
         "comments": "",\r
         "x": 4510.883331298828,\r
-        "y": 994.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1037,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d43945c8.bc5bc",\r
+        "id": "8cad1e9f.c00c5",\r
         "type": "comment",\r
         "name": "This is it (should be)",\r
         "info": "",\r
         "comments": "",\r
         "x": 4502.883331298828,\r
-        "y": 1084.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1127,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1e4146ab.95c211",\r
+        "id": "a78c5989.f5207",\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`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",\r
         "comments": "",\r
         "x": 3269.883331298828,\r
-        "y": 2567.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2610,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "893317d2.3ef5f",\r
+        "id": "5f144ff2.8e6388",\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 = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3401.883331298828,\r
-        "y": 1817.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1860,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fd0edd2e.c98978",\r
+        "id": "f39161b8.c95518",\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-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3308.883331298828,\r
-        "y": 1764.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1807,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "98563074.1e7ea",\r
+        "id": "8af2638e.140428",\r
         "type": "execute",\r
         "name": "execute UUID generator for ethernet-service-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2426.883331298828,\r
-        "y": 142.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 185,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c475408d.68ef",\r
+        "id": "b2d6bb83.745318",\r
         "type": "set",\r
         "name": "set new ethernet-service-name",\r
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
         "comments": "",\r
         "x": 2360.883331298828,\r
-        "y": 178.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 221,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e109d5f4.51e5d",\r
+        "id": "efb9627d.c73688",\r
         "type": "comment",\r
         "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",\r
         "info": "",\r
         "comments": "",\r
         "x": 2545.883331298828,\r
-        "y": 105.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 148,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2e92209c.b2514",\r
+        "id": "7954d1dd.93732",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
         "x": 4036.883331298828,\r
-        "y": 1795.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 1838,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc84986.18b2868",\r
+        "id": "48007645.c6e248",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
         "x": 4014.883331298828,\r
-        "y": 2665.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2708,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e351db25.84cdc8",\r
+        "id": "e22daf3c.82e7c8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3441.8837890625,\r
-        "y": 7438.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 7480.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bbb27c53.89e32",\r
+        "id": "ba2fa114.256608",\r
         "type": "comment",\r
         "name": "START OF DELETE OPERATION",\r
         "info": "",\r
         "comments": "",\r
         "x": 3288.88330078125,\r
-        "y": 2897.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 2939.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3023ae1c.6e2482",\r
+        "id": "cea904e8.518f5",\r
         "type": "save",\r
         "name": "delete LEAF uni resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3874.566650390625,\r
-        "y": 3087.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3129.400115966797,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a4dfc5e6.4600f",\r
+        "id": "8c6f82a5.234d18",\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": 3245.566650390625,\r
-        "y": 3017.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3059.400115966797,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3c4fb74b.12c308",\r
-                "cc5ca51c.d55828",\r
-                "10482aca.fa7bbd"\r
+                "980e282b.21ebf",\r
+                "62337ab9.8b1c5c",\r
+                "ac27f627.a68b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc5ca51c.d55828",\r
+        "id": "62337ab9.8b1c5c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3473.0576171875,\r
-        "y": 2989.857421875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3031.974090576172,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f3fff98e.f3e778"\r
+                "a4aab25a.3920c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10482aca.fa7bbd",\r
+        "id": "ac27f627.a68b4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3468.566650390625,\r
-        "y": 3034.2833862304688,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3076.4000549316406,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "686bd6b1.dd501"\r
+                "98b8996.e5a3fe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3fff98e.f3e778",\r
+        "id": "a4aab25a.3920c",\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": 3635.629150390625,\r
-        "y": 2989.1431274414062,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3031.259796142578,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "686bd6b1.dd501",\r
+        "id": "98b8996.e5a3fe8",\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": 3636.566650390625,\r
-        "y": 3034.2833862304688,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3076.4000549316406,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3c4fb74b.12c308",\r
+        "id": "980e282b.21ebf",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3480.566650390625,\r
-        "y": 3084.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3126.400115966797,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9563229e.3fe02"\r
+                "50a09dc8.f07414"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9563229e.3fe02",\r
+        "id": "50a09dc8.f07414",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3632.88330078125,\r
-        "y": 3087.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3129.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f32c210.90e5fe",\r
-                "3023ae1c.6e2482",\r
-                "dfd78621.0c4df"\r
+                "839bae2a.5eaff8",\r
+                "cea904e8.518f5",\r
+                "8b478b6f.069ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f32c210.90e5fe",\r
+        "id": "839bae2a.5eaff8",\r
         "type": "set",\r
         "name": "set bwToBeDecreased tpid cvlan",\r
         "xml": "<set>\n<parameter name='bwToBeDecreased' value=\"`$tmp.aai.leafuni.data-source`\" />\n<parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />\n\n\n",\r
         "comments": "",\r
         "x": 3877.566650390625,\r
-        "y": 3030.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3072.400115966797,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4c9abbae.5d458c",\r
+        "id": "5a01c9ff.aa79b8",\r
         "type": "comment",\r
         "name": "Update ROOT UNI's bw",\r
         "info": "",\r
         "comments": "",\r
         "x": 3833.566650390625,\r
-        "y": 3193.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3235.199920654297,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "547f08e5.b430b",\r
+        "id": "e327e4d5.a4e2b",\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": 4435.566650390625,\r
-        "y": 3298.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3340.199920654297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dfd78621.0c4df",\r
+        "id": "8b478b6f.069ff8",\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": 3825.56640625,\r
-        "y": 3239.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3281.199920654297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "51d31fac.6dab6",\r
-                "d9c98a3d.c2af8",\r
-                "e932164d.0b10e8"\r
+                "b9a017aa.207728",\r
+                "1cc16855.ddb44",\r
+                "cca9f79e.b7e85"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9c98a3d.c2af8",\r
+        "id": "1cc16855.ddb44",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4053.057373046875,\r
-        "y": 3211.6572265625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3253.773895263672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f1a39628.bdc748"\r
+                "dd7a8720.93a36"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e932164d.0b10e8",\r
+        "id": "cca9f79e.b7e85",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4048.56640625,\r
-        "y": 3256.0831909179688,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3298.1998596191406,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "dfc7b8eb.48de78"\r
+                "bfa4184f.a70f18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1a39628.bdc748",\r
+        "id": "dd7a8720.93a36",\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": 4215.62890625,\r
-        "y": 3210.9429321289062,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3253.059600830078,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dfc7b8eb.48de78",\r
+        "id": "bfa4184f.a70f18",\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": 4216.56640625,\r
-        "y": 3256.0831909179688,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3298.1998596191406,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd0cc66d.fbf3a8",\r
+        "id": "51dfcdd2.a7dd1c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4213.56640625,\r
-        "y": 3306.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3348.199920654297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9a3f7682.b82b9",\r
-                "547f08e5.b430b"\r
+                "f4f7b843.eb2a48",\r
+                "e327e4d5.a4e2b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51d31fac.6dab6",\r
+        "id": "b9a017aa.207728",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4044.56640625,\r
-        "y": 3306.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3348.199920654297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "dd0cc66d.fbf3a8"\r
+                "51dfcdd2.a7dd1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a3f7682.b82b9",\r
+        "id": "f4f7b843.eb2a48",\r
         "type": "set",\r
         "name": "set new bw",\r
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
         "comments": "",\r
         "x": 4395.567138671875,\r
-        "y": 3248.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3290.199920654297,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "998e4ab7.4d5be",\r
+        "id": "7302cb88.8e6284",\r
         "type": "comment",\r
         "name": "Delete LEAF UNI",\r
         "info": "",\r
         "comments": "",\r
         "x": 3825.88330078125,\r
-        "y": 2971.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3013.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44b90aa0.b32f1c",\r
+        "id": "5b4e5a5d.18c714",\r
         "type": "set",\r
         "name": "set current-provider-id and current-cvlan-id",\r
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",\r
         "comments": "",\r
         "x": 3311.749969482422,\r
-        "y": 3750.483367919922,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3792.6000366210938,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a719f3a.33348",\r
+        "id": "a7a1bb48.b43ec8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3444.749969482422,\r
-        "y": 3798.483367919922,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3840.6000366210938,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "33975a1e.497a26",\r
+        "id": "7b0989f8.4cdbd",\r
         "type": "switchNode",\r
         "name": "switch found-connectivity?",\r
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3266.749969482422,\r
-        "y": 3850.283416748047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3892.4000854492188,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6169e5ef.6af5c4",\r
-                "e3565ed9.a6bae8"\r
+                "723122ee.60b394",\r
+                "1f79397f.9ef707"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6169e5ef.6af5c4",\r
+        "id": "723122ee.60b394",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3459.749969482422,\r
-        "y": 3851.283416748047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3893.4000854492188,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3f7c202a.f0897"\r
+                "fc2d1c85.b4eee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f7c202a.f0897",\r
+        "id": "fc2d1c85.b4eee",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",\r
         "comments": "",\r
         "x": 3603.749969482422,\r
-        "y": 3847.483367919922,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3889.6000366210938,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3565ed9.a6bae8",\r
+        "id": "1f79397f.9ef707",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3463.749969482422,\r
-        "y": 3895.283416748047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3937.4000854492188,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "c54729aa.dea04"\r
+                "6275f59c.0890b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c54729aa.dea04",\r
+        "id": "6275f59c.0890b4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3602.749969482422,\r
-        "y": 3890.283416748047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3932.4000854492188,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "563cd7a4.5a9238",\r
-                "f2c9af7.5a8ebd",\r
-                "2a4d2a1b.ff481e"\r
+                "810f11d9.c59a7",\r
+                "852c933b.a9e98",\r
+                "dd94c766.3611e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "563cd7a4.5a9238",\r
+        "id": "810f11d9.c59a7",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3853.149627685547,\r
-        "y": 3898.800018310547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3940.9166870117188,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ec034714.60ea58"\r
+                "4f7025f7.9e0214"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec034714.60ea58",\r
+        "id": "4f7025f7.9e0214",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4075.149627685547,\r
-        "y": 3876.800018310547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3918.9166870117188,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e531db92.56031"\r
+                "c1dfdbf7.de4f68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e531db92.56031",\r
+        "id": "c1dfdbf7.de4f68",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4235.149139404297,\r
-        "y": 3856.800018310547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3898.9166870117188,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d94f5698.a9e22"\r
+                "811e3163.5710b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "717ee9f8.5f5168",\r
+        "id": "7642582a.7718e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4388.149658203125,\r
-        "y": 3837.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3879.916717529297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "44024f46.b6d6d",\r
-                "8cf84976.9daac8"\r
+                "b019880c.9753e",\r
+                "f61cef0c.bbc238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44024f46.b6d6d",\r
+        "id": "b019880c.9753e",\r
         "type": "set",\r
         "name": "set tmp.stillHasUni to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
         "comments": "",\r
         "x": 4584.649871826172,\r
-        "y": 3805.883270263672,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3847.9999389648438,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2c9af7.5a8ebd",\r
+        "id": "852c933b.a9e98",\r
         "type": "set",\r
         "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",\r
         "comments": "",\r
         "x": 3959.64990234375,\r
-        "y": 3817.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3859.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a4d2a1b.ff481e",\r
+        "id": "dd94c766.3611e8",\r
         "type": "switchNode",\r
         "name": "switch tmp.keepVPNBs?",\r
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3767.64990234375,\r
-        "y": 4238.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4281.000213623047,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "39fb0c16.c2b2c4",\r
-                "808499cb.5bf588"\r
+                "73d16500.5c0ae4",\r
+                "d3a70ceb.c50b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cf84976.9daac8",\r
+        "id": "f61cef0c.bbc238",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4552.88330078125,\r
-        "y": 3873.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3915.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "808499cb.5bf588",\r
+        "id": "d3a70ceb.c50b78",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 154.65066528320312,\r
-        "y": 5302.8837890625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5345.000457763672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7018ac1a.7a3c7c"\r
+                "4a51985e.972e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39fb0c16.c2b2c4",\r
+        "id": "73d16500.5c0ae4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3988.650634765625,\r
-        "y": 4340.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4383.000213623047,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "a235b563.2e3c2"\r
+                "25f72ad2.47990e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a235b563.2e3c2",\r
+        "id": "25f72ad2.47990e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4131.650634765625,\r
-        "y": 4336.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4379.000213623047,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ca74ec50.92ce48",\r
-                "76172197.657ac",\r
-                "2a3f4733.a29bc",\r
-                "c850b8e4.0504c8",\r
-                "46570b89.8afbb4",\r
-                "819543bf.270a9",\r
-                "ca7e6690.5ab92",\r
-                "26004944.36227e"\r
+                "6e8bafff.64fc88",\r
+                "dcf23a76.fb4f5",\r
+                "f889b68d.197d9",\r
+                "69806916.62139",\r
+                "32064458.33cdf4",\r
+                "9c7a66fb.560d48",\r
+                "2b19eccb.73cf0c",\r
+                "987f769f.1ba7f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d4f67a6.1fc128",\r
+        "id": "316316fc.4e3ac2",\r
         "type": "comment",\r
         "name": "keepVPNBs == false, then check tmp.stillHasUni",\r
-        "info": "(2) keepVPNBs == false, means there are no other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\ncheck if tmp.stillHasUni is True or False?\n\nif TRUE --> means this domain (connectivity) still has other UNIs\n- delete VPNBs\n- delete LEAF UNI in AAI -- DONE\n- upadte bw in ROOT UNI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC\n- change ROOT conn status to Modified\n\nif FALSE --> means this domain (connectivity) has no other UNIs\n\nif MMstillHasUni == TRUE, means scenario (3), else, means scenario (4)\n\n(3) & (4) both:\n- delete VPNBs\n- delete LEAF connectivity\n- delete LEAF Ethernet Service from PNC\n\n(3) only:\n- change ROOT conn status to Modified\n- Keep the middle-man-conn and DON'T delete\n\n(4) only:\n- delete ROOT UNI\n- delete ROOT conn from AAI\n- delete ROOT Ethernet Service from PNC\n- delete middle-man-conn from AAI\n\n",\r
+        "info": "(2) keepVPNBs == false, means there are no other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\ncheck if tmp.stillHasUni is True or False?\n\nif TRUE --> means this domain (connectivity) still has other UNIs\n- delete VPNBs\n- delete LEAF UNI in AAI -- DONE\n- upadte bw in ROOT UNI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC\n- change ROOT conn status to Modified\n--- mark LEAF connectivity as Modified because the underlay OTN tunnel list of this connectivity is now different\n\nif FALSE --> means this domain (connectivity) has no other UNIs\n\nif MMstillHasUni == TRUE, means scenario (3), else, means scenario (4)\n\n(3) & (4) both:\n- delete VPNBs\n- delete LEAF connectivity\n- delete LEAF Ethernet Service from PNC\n\n(3) only:\n- change ROOT conn status to Modified\n- Keep the middle-man-conn and DON'T delete\n\n(4) only:\n- delete ROOT UNI\n- delete ROOT conn from AAI\n- delete ROOT Ethernet Service from PNC\n- delete middle-man-conn from AAI\n\n",\r
         "comments": "",\r
         "x": 181,\r
-        "y": 5258.8837890625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5301.000457763672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cbdd9201.8f12c8",\r
+        "id": "32c3f6b1.304972",\r
         "type": "comment",\r
         "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",\r
         "info": "(1) keepVPNBs == true, means there are still other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\n- Only update bw of the vpn-bindings involved -- DONE\n- upadte bw in ROOT UNI -- DONE\n- change ROOT conn status to Modified -- DONE\n- delete LEAF UNI in AAI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC -- DONE\n- DON'T delete the connectivities of LEAF and ROOT -- DONE\nAlso update the ethernet services",\r
         "comments": "",\r
         "x": 4007.884033203125,\r
-        "y": 4303.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4346.000213623047,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3d91414.090028",\r
+        "id": "7adbe8ea.ad8838",\r
         "type": "set",\r
         "name": "set srcTtp OTN layer",\r
         "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4820.667724609375,\r
-        "y": 4494.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4536.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8bf6af15.0a9a48",\r
+        "id": "ee3b3067.d425a8",\r
         "type": "switchNode",\r
         "name": "switch provider-id domainA",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5165.667724609375,\r
-        "y": 4356.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4398.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8859d6ca.2f75b8"\r
+                "76f6067d.796678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c067ba23.0c8be",\r
+        "id": "fc93f53c.f481d",\r
         "type": "for",\r
         "name": "for netwidx..allNetworksList_length",\r
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4872.667724609375,\r
-        "y": 4350.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4392.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8bf6af15.0a9a48"\r
+                "ee3b3067.d425a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2da7141c.ae03fc",\r
+        "id": "3f4440b0.d66f8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5127.667724609375,\r
-        "y": 4307.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4349.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1cbc0879.d4095",\r
+        "id": "27f65669.8e0af2",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
         "comments": "",\r
         "x": 4816.667724609375,\r
-        "y": 4402.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4444.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "faedf550.ca72d",\r
+        "id": "410c70eb.214758",\r
         "type": "set",\r
         "name": "set tmp.pce-src-node",\r
         "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",\r
         "comments": "",\r
         "x": 4824.667724609375,\r
-        "y": 4447.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4489.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b550765.eaf4d1",\r
+        "id": "e258b42d.2c46d8",\r
         "type": "set",\r
         "name": "unset otnTopoIdSrc",\r
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
         "comments": "",\r
         "x": 4821.667724609375,\r
-        "y": 4300.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4342.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8859d6ca.2f75b8",\r
+        "id": "76f6067d.796678",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5074.667724609375,\r
-        "y": 4424.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4466.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b9fd6938.f76ca8"\r
+                "acca9da1.cc4618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9fd6938.f76ca8",\r
+        "id": "acca9da1.cc4618",\r
         "type": "switchNode",\r
         "name": "switch te-topo-id",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5259.667724609375,\r
-        "y": 4423.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4465.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d7c2d227.430278"\r
+                "f448b4f8.c120e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7c2d227.430278",\r
+        "id": "f448b4f8.c120e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5451.667724609375,\r
-        "y": 4426.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4468.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9062d4ad.31e34"\r
+                "19985725.a5eca1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9062d4ad.31e34",\r
+        "id": "19985725.a5eca1",\r
         "type": "set",\r
         "name": "set otnTopoIdSrc",\r
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
         "x": 5623.667724609375,\r
-        "y": 4422.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4464.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c312f389.231768",\r
+        "id": "ab4edace.9f77f",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4999.667724609375,\r
-        "y": 4537.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4579.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ca74ec50.92ce48",\r
+        "id": "6e8bafff.64fc88",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4516.667724609375,\r
-        "y": 4322.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4364.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3f12b93a.0cf81e",\r
-                "24786620.817bb2",\r
-                "1cbc0879.d4095",\r
-                "faedf550.ca72d",\r
-                "a3d91414.090028",\r
-                "c067ba23.0c8be",\r
-                "c312f389.231768"\r
+                "30c992c8.4db58e",\r
+                "c2728b20.458338",\r
+                "27f65669.8e0af2",\r
+                "410c70eb.214758",\r
+                "7adbe8ea.ad8838",\r
+                "fc93f53c.f481d",\r
+                "ab4edace.9f77f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1877ba6b.c5c236",\r
+        "id": "2e6e6c8a.c892fc",\r
         "type": "comment",\r
         "name": "The following section is to find srcTtp OTN layer (its long name)",\r
         "info": "The following section is to find srcTtp OTN layer (its long name)",\r
         "comments": "",\r
         "x": 4501.667724609375,\r
-        "y": 4256.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4298.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24786620.817bb2",\r
+        "id": "c2728b20.458338",\r
         "type": "get-resource",\r
         "name": "get-resource network-resources-list",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4880.667724609375,\r
-        "y": 4243.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4285.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "c082f0f0.3fe63",\r
-                "8aa79b73.5d91b",\r
-                "2da7141c.ae03fc"\r
+                "cd41e347.c8a4d",\r
+                "5bcb3237.45bf24",\r
+                "3f4440b0.d66f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c082f0f0.3fe63",\r
+        "id": "cd41e347.c8a4d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5116.667724609375,\r
-        "y": 4226.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4268.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8aa79b73.5d91b",\r
+        "id": "5bcb3237.45bf24",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5113.667724609375,\r
-        "y": 4267.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4309.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3f12b93a.0cf81e",\r
+        "id": "30c992c8.4db58e",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
         "comments": "",\r
         "x": 4829.667724609375,\r
-        "y": 4200.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4242.783660888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "76172197.657ac",\r
+        "id": "dcf23a76.fb4f5",\r
         "type": "set",\r
         "name": "unset tmp.aai.all-vpn-bindings",\r
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",\r
         "comments": "",\r
         "x": 4336.667724609375,\r
-        "y": 4655.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4697.183563232422,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d9693eef.d5133",\r
+        "id": "f549a24.b4e97e",\r
         "type": "comment",\r
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",\r
         "info": "",\r
         "comments": "",\r
         "x": 4459.968017578125,\r
-        "y": 4694.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4736.183563232422,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a3f4733.a29bc",\r
+        "id": "f889b68d.197d9",\r
         "type": "save",\r
         "name": "get all-vpn-bindings from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4357.968017578125,\r
-        "y": 4729.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4771.183563232422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e8babd58.4782b",\r
-                "e0bbecb2.837888",\r
-                "bb53595.0530328"\r
+                "f7fe6bc0.f9d1a8",\r
+                "b939c13a.bd148",\r
+                "63930841.13965"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8babd58.4782b",\r
+        "id": "f7fe6bc0.f9d1a8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4562.968017578125,\r
-        "y": 4726.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4768.183563232422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8299b116.2a1f1"\r
+                "85787fa.a0f0d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0bbecb2.837888",\r
+        "id": "b939c13a.bd148",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4546.458984375,\r
-        "y": 4787.640930175781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4829.757598876953,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "af952dc7.60185"\r
+                "c496c4d4.109c78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb53595.0530328",\r
+        "id": "63930841.13965",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4543.968017578125,\r
-        "y": 4831.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4873.183563232422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "a2d64007.4e8e68"\r
+                "bb1ebaa9.c2fac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8299b116.2a1f1",\r
+        "id": "85787fa.a0f0d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4730.96826171875,\r
-        "y": 4721.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4763.183563232422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "575eea2a.c26ae4"\r
+                "6a7a29b4.6659c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af952dc7.60185",\r
+        "id": "c496c4d4.109c78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
         "x": 4709.0303955078125,\r
-        "y": 4787.926666259766,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4830.0433349609375,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a2d64007.4e8e68",\r
+        "id": "bb1ebaa9.c2fac",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4710.968017578125,\r
-        "y": 4830.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4872.183563232422,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "575eea2a.c26ae4",\r
+        "id": "6a7a29b4.6659c",\r
         "type": "for",\r
         "name": "for vpnidx in all-vpn-bindings",\r
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4968.96826171875,\r
-        "y": 4726.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4768.183563232422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b0cdcdcc.86b948"\r
+                "2e12f618.b174b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0cdcdcc.86b948",\r
+        "id": "2e12f618.b174b2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5202.968017578125,\r
-        "y": 4733.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4775.183563232422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fe17da41.8d7458"\r
+                "1b37b556.addac3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63f7f511.d89814",\r
+        "id": "3df57bb4.1a97cc",\r
         "type": "comment",\r
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
         "info": "",\r
         "comments": "",\r
         "x": 5188.784423828125,\r
-        "y": 4955.2333984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4997.350067138672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe17da41.8d7458",\r
+        "id": "1b37b556.addac3",\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": 5221.784423828125,\r
-        "y": 5023.2333984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5065.350067138672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "adceca9b.52be78",\r
-                "6371c80.a864db8"\r
+                "c62dd674.fd73f",\r
+                "37627bf2.c03934"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6371c80.a864db8",\r
+        "id": "37627bf2.c03934",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5465.784454345703,\r
-        "y": 4995.233184814453,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5037.349853515625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "adceca9b.52be78",\r
+        "id": "c62dd674.fd73f",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5346.784423828125,\r
-        "y": 4921.233154296875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4963.349822998047,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "eabe2b02.0bc13"\r
+                "a5ecb13c.9c7548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eabe2b02.0bc13",\r
+        "id": "a5ecb13c.9c7548",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5473.767822265625,\r
-        "y": 4859.649658203125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4901.766326904297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b15dfc5.1130d",\r
-                "7054ba61.11f874",\r
-                "e5483e65.23a9a"\r
+                "78a5ede3.09cc54",\r
+                "aecf8872.1d5c4",\r
+                "657d43b1.13c254"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "771d8350.1c0644",\r
+        "id": "9d348107.818aa",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5709.8173828125,\r
-        "y": 4743.64990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4785.766571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3a42df45.8a578"\r
+                "99f28c5d.95abe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a42df45.8a578",\r
+        "id": "99f28c5d.95abe8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5901.8173828125,\r
-        "y": 4732.650146484375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4774.766815185547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f5feb746.9bcea8"\r
+                "9a75bdf9.10641"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b15dfc5.1130d",\r
+        "id": "78a5ede3.09cc54",\r
         "type": "set",\r
         "name": "unset tmp.aai.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",\r
         "comments": "",\r
         "x": 5658.334228515625,\r
-        "y": 4633.866943359375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4675.983612060547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7054ba61.11f874",\r
+        "id": "aecf8872.1d5c4",\r
         "type": "set",\r
         "name": "set tmp.aai.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
         "comments": "",\r
         "x": 5650.334228515625,\r
-        "y": 4682.866943359375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4724.983612060547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e5483e65.23a9a",\r
+        "id": "657d43b1.13c254",\r
         "type": "save",\r
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />\n<parameter name='operational-status' value='Modified' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5881.751220703125,\r
-        "y": 4864.032958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4906.149627685547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c01f7460.fab75",\r
+        "id": "f1c96228.a5339",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5833.401123046875,\r
-        "y": 4911.349853515625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4953.466522216797,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a637b405.b076f",\r
+        "id": "75d6304c.089cd8",\r
         "type": "comment",\r
         "name": "decrease the bw of the-vpn-binding and change status to modified",\r
         "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",\r
         "comments": "",\r
         "x": 5905.751220703125,\r
-        "y": 4825.032958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4867.149627685547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5feb746.9bcea8",\r
+        "id": "9a75bdf9.10641",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6083.8173828125,\r
-        "y": 4711.650146484375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4753.766815185547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "4f7dc832.d994c8"\r
+                "b5ad886.81af5f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f7dc832.d994c8",\r
+        "id": "b5ad886.81af5f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 6245.8173828125,\r
-        "y": 4700.650146484375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4742.766815185547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f7240b03.b46408",\r
-                "a1eea84d.7200b"\r
+                "6f94f7eb.f4d818",\r
+                "269fac18.2bb21c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7240b03.b46408",\r
+        "id": "6f94f7eb.f4d818",\r
         "type": "set",\r
         "name": "unset tmp.the-connectivity",\r
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",\r
         "comments": "",\r
         "x": 6442.8173828125,\r
-        "y": 4629.650146484375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4671.766815185547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1eea84d.7200b",\r
+        "id": "269fac18.2bb21c",\r
         "type": "set",\r
         "name": "set tmp.the-connectivity",\r
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
         "x": 6440.2841796875,\r
-        "y": 4728.866943359375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4770.983612060547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ce0d81bd.d28a7",\r
+        "id": "a984d0c7.8574d",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3097.800048828125,\r
-        "y": 3187.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3229.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7f04acf4.5afc3c",\r
+        "id": "49347bae.3e2974",\r
         "type": "switchNode",\r
         "name": "switch found-middle-man?",\r
         "xml": "<switch test='`$found-middle-man`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2974.800048828125,\r
-        "y": 3297.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3339.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d1c2eeb4.215af8",\r
-                "f1f6bb53.ccd5d8"\r
+                "7b835f88.3b076",\r
+                "7490c0ec.4dda5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1c2eeb4.215af8",\r
+        "id": "7b835f88.3b076",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3158.800048828125,\r
-        "y": 3276.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3318.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d53b6d30.115bd"\r
+                "5b141b7a.8f28f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d53b6d30.115bd",\r
+        "id": "5b141b7a.8f28f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3301.800048828125,\r
-        "y": 3276.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3318.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5f773b5f.84092c"\r
+                "94596646.a7e4f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f773b5f.84092c",\r
+        "id": "94596646.a7e4f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",\r
         "comments": "",\r
         "x": 3477.800048828125,\r
-        "y": 3274.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3316.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1f6bb53.ccd5d8",\r
+        "id": "7490c0ec.4dda5",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3156.800048828125,\r
-        "y": 3331.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3373.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e42ba1d9.fa7b7"\r
+                "a3855d70.dbb87"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e42ba1d9.fa7b7",\r
+        "id": "a3855d70.dbb87",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3003.800048828125,\r
-        "y": 3464.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3506.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "44b90aa0.b32f1c",\r
-                "2a719f3a.33348",\r
-                "33975a1e.497a26",\r
-                "c19f56be.5aa798",\r
-                "eb35e3d0.6d25d",\r
-                "5aebe180.f62f68"\r
+                "5b4e5a5d.18c714",\r
+                "a7a1bb48.b43ec8",\r
+                "7b0989f8.4cdbd",\r
+                "b98b1ba5.429c1",\r
+                "37657916.72f08e",\r
+                "cc0c619e.32de58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c85f7ca.d8c4a",\r
+        "id": "a5a62e88.7d802",\r
         "type": "comment",\r
         "name": "Find LEAF connectivity",\r
         "info": "",\r
         "comments": "",\r
         "x": 3225.88330078125,\r
-        "y": 3704.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3746.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c19f56be.5aa798",\r
+        "id": "b98b1ba5.429c1",\r
         "type": "set",\r
         "name": "set tmp.MMstillHasUni to FALSE",\r
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",\r
         "comments": "",\r
         "x": 3308.333251953125,\r
-        "y": 3477.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3519.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb35e3d0.6d25d",\r
+        "id": "37657916.72f08e",\r
         "type": "for",\r
         "name": "for each relationship of middle-man-conn",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3306.8330078125,\r
-        "y": 3523.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3565.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ca4bb58e.913108"\r
+                "1a4c3937.32a93f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca4bb58e.913108",\r
+        "id": "1a4c3937.32a93f",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3569.8330078125,\r
-        "y": 3518.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3560.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "468a474d.40c4d8"\r
+                "95d80a37.7eef5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "468a474d.40c4d8",\r
+        "id": "95d80a37.7eef5",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3729.83251953125,\r
-        "y": 3498.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3540.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e61de8ad.7030f"\r
+                "9608373.19689c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3444ada9.d2b992",\r
+        "id": "d9ea756c.06e5e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4498.833740234375,\r
-        "y": 3533.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3575.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7b31b3f.9c4444c",\r
-                "31b46b09.5b560c",\r
-                "a9c3a9a9.0f7c28"\r
+                "29278691.db117a",\r
+                "29bad35d.650d14",\r
+                "a6af6c62.1a6b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b31b3f.9c4444c",\r
+        "id": "29278691.db117a",\r
         "type": "set",\r
         "name": "set tmp.MMstillHasUni to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",\r
         "comments": "",\r
         "x": 4738.334228515625,\r
-        "y": 3482.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3524.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "31b46b09.5b560c",\r
+        "id": "29bad35d.650d14",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4671.567657470703,\r
-        "y": 3555.683380126953,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3597.800048828125,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dbe78677.7f04b8",\r
+        "id": "4465f9ec.e3dbb",\r
         "type": "comment",\r
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
         "info": "",\r
         "comments": "",\r
         "x": 4432.88427734375,\r
-        "y": 5085.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5128.000213623047,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c850b8e4.0504c8",\r
+        "id": "69806916.62139",\r
         "type": "set",\r
         "name": "set tmp.leafconn.",\r
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
         "comments": "",\r
         "x": 4331.317138671875,\r
-        "y": 5137.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5179.916717529297,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ca7e6690.5ab92",\r
+        "id": "2b19eccb.73cf0c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4482.317138671875,\r
-        "y": 5580.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5622.916717529297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "26004944.36227e",\r
+        "id": "987f769f.1ba7f8",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4297.317138671875,\r
-        "y": 5647.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5689.916717529297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "c57768ca.7a8088",\r
-                "7224490d.b02598"\r
+                "c7979e94.4deb18",\r
+                "5e8c956f.69a854"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c57768ca.7a8088",\r
+        "id": "c7979e94.4deb18",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4562.317138671875,\r
-        "y": 5632.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5674.916717529297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "25615183.2d4bd6"\r
+                "4a28d2a5.936924"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7224490d.b02598",\r
+        "id": "5e8c956f.69a854",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4558.317138671875,\r
-        "y": 5680.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5722.916717529297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5dcdd7b9.89499"\r
+                "213fbf95.d03c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25615183.2d4bd6",\r
+        "id": "4a28d2a5.936924",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4718.317138671875,\r
-        "y": 5628.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5670.916717529297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9b98cd10.6cfb68"\r
+                "a96c5a1a.d66bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5dcdd7b9.89499",\r
+        "id": "213fbf95.d03c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
         "comments": "",\r
         "x": 4706.317138671875,\r
-        "y": 5675.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5717.916717529297,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f97c958c.da83b8",\r
+        "id": "4e8315f.b9446ec",\r
         "type": "set",\r
         "name": "set tmp.rootconn.",\r
         "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 5138.3173828125,\r
-        "y": 5570.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5612.916717529297,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "903178c6.839788",\r
+        "id": "aa7d5d8.eb8bca",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",\r
         "comments": "",\r
         "x": 4540.734130859375,\r
-        "y": 5167.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5209.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46570b89.8afbb4",\r
+        "id": "32064458.33cdf4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4311.734130859375,\r
-        "y": 5256.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5298.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "903178c6.839788",\r
-                "42c91ccf.e64244"\r
+                "aa7d5d8.eb8bca",\r
+                "3165c974.539e06"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42c91ccf.e64244",\r
+        "id": "3165c974.539e06",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4547.734130859375,\r
-        "y": 5249.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5291.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "30eabd9c.98c532",\r
-                "66fbb0fb.26a3f",\r
-                "fbd21163.a12cd8"\r
+                "4cddcbba.102194",\r
+                "d5cd17da.64e6a",\r
+                "9d33157c.077f3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30eabd9c.98c532",\r
+        "id": "4cddcbba.102194",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4743.2342529296875,\r
-        "y": 5201.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5243.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "26c5ac0c.2065fc"\r
+                "658952ec.d50f2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66fbb0fb.26a3f",\r
+        "id": "d5cd17da.64e6a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4735.2342529296875,\r
-        "y": 5256.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5298.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "a0a0372d.9d324"\r
+                "f87d3f72.db25b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26c5ac0c.2065fc",\r
+        "id": "658952ec.d50f2c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4887.6165771484375,\r
-        "y": 5200.739410400391,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5242.8560791015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "40d1dc2e.899afc"\r
+                "5e03d50d.e31174"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40d1dc2e.899afc",\r
+        "id": "5e03d50d.e31174",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5071.734130859375,\r
-        "y": 5199.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5241.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "137e1346.633fe5"\r
+                "81fcac6e.c2cbb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "137e1346.633fe5",\r
+        "id": "81fcac6e.c2cbb",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5266.734130859375,\r
-        "y": 5199.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5241.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "19ce94ba.82e9d3"\r
+                "23740bd0.c54174"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fbd21163.a12cd8",\r
+        "id": "9d33157c.077f3",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4740.2342529296875,\r
-        "y": 5313.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5355.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "4a6cd196.293db"\r
+                "d477847d.474a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a6cd196.293db",\r
+        "id": "d477847d.474a8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 4892.2342529296875,\r
-        "y": 5314.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5356.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a0a0372d.9d324",\r
+        "id": "f87d3f72.db25b",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 4903.2342529296875,\r
-        "y": 5257.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5299.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1398b0a6.59adbf",\r
+        "id": "e3023af7.680d7",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5648.734130859375,\r
-        "y": 5203.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5245.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ac703b64.91e208",\r
-                "60a60a9a.326334",\r
-                "feb4d66b.8d20f"\r
+                "31c1897e.fbb116",\r
+                "b906e4f7.66368",\r
+                "ac0e0ca2.883cb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19ce94ba.82e9d3",\r
+        "id": "23740bd0.c54174",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5469.734130859375,\r
-        "y": 5203.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5245.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "1398b0a6.59adbf"\r
+                "e3023af7.680d7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60a60a9a.326334",\r
+        "id": "b906e4f7.66368",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5854.734130859375,\r
-        "y": 5216.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5258.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9885a0c6.ee00f8",\r
-                "a77a3d25.4123b",\r
-                "3b9ca266.b8d5f6"\r
+                "df7977a7.075b8",\r
+                "f17bde95.882498",\r
+                "61e2d23e.358d1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac703b64.91e208",\r
+        "id": "31c1897e.fbb116",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
         "x": 5884.734130859375,\r
-        "y": 5164.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5206.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9885a0c6.ee00f8",\r
+        "id": "df7977a7.075b8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6064.734130859375,\r
-        "y": 5207.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5249.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fd819e5.0208ae"\r
+                "7ac6fe75.62b4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a77a3d25.4123b",\r
+        "id": "f17bde95.882498",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6056.734130859375,\r
-        "y": 5262.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5304.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9503eaf8.25455"\r
+                "671c9934.2cd48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b9ca266.b8d5f6",\r
+        "id": "61e2d23e.358d1c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6061.734130859375,\r
-        "y": 5319.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5361.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2f6c8ed.964c6f2"\r
+                "a6615570.50c968"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f6c8ed.964c6f2",\r
+        "id": "a6615570.50c968",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 6213.734130859375,\r
-        "y": 5320.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5362.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9503eaf8.25455",\r
+        "id": "671c9934.2cd48",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 6224.734130859375,\r
-        "y": 5265.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5307.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd819e5.0208ae",\r
+        "id": "7ac6fe75.62b4e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6209.116455078125,\r
-        "y": 5204.739410400391,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5246.8560791015625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fdf4316f.fecc18"\r
+                "6989c737.25d068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fdf4316f.fecc18",\r
+        "id": "6989c737.25d068",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
         "x": 6423.734130859375,\r
-        "y": 5201.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5243.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "feb4d66b.8d20f",\r
+        "id": "ac0e0ca2.883cb",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 5804.734130859375,\r
-        "y": 5280.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5322.200408935547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "819543bf.270a9",\r
+        "id": "9c7a66fb.560d48",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4453.234375,\r
-        "y": 5360.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5402.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fe68d2f2.044a28",\r
-                "9d6b0bdc.79122"\r
+                "1e28e096.7499f7",\r
+                "cc9e5694.f9d17"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe68d2f2.044a28",\r
+        "id": "1e28e096.7499f7",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4813.734130859375,\r
-        "y": 5368.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5410.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "dd8bd538.48e76"\r
+                "906e379.3b93848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd8bd538.48e76",\r
+        "id": "906e379.3b93848",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
         "comments": "",\r
         "x": 4971.734130859375,\r
-        "y": 5368.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5410.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "17aac5bf.8ce3ca",\r
+        "id": "90be5ca9.028288",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4975.234130859375,\r
-        "y": 5408.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5450.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9d6b0bdc.79122",\r
+        "id": "cc9e5694.f9d17",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4817.734130859375,\r
-        "y": 5408.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5450.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "17aac5bf.8ce3ca"\r
+                "90be5ca9.028288"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67f63093.820248",\r
+        "id": "921095c8.3bc23",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5126.451171875,\r
-        "y": 5622.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5664.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9523ac21.fb27e8",\r
-                "ee545a84.5a0b8"\r
+                "fb4f4697.4dc5f",\r
+                "7ea31674.99e1d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee545a84.5a0b8",\r
+        "id": "7ea31674.99e1d8",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5368.450927734375,\r
-        "y": 5572.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5614.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3e67e67b.64c0f2",\r
-                "83fa1a94.1fdef",\r
-                "8d7d3b80.341b3"\r
+                "10743e5b.0b6182",\r
+                "5598183a.212ab",\r
+                "9c9074e9.bbaff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e67e67b.64c0f2",\r
+        "id": "10743e5b.0b6182",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5563.951171875,\r
-        "y": 5506.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5548.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "4b842a3.ce68254"\r
+                "767943d2.64a144"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83fa1a94.1fdef",\r
+        "id": "5598183a.212ab",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5559.951171875,\r
-        "y": 5562.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5604.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fe24638.108ff2"\r
+                "74a77564.40268c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b842a3.ce68254",\r
+        "id": "767943d2.64a144",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5708.3333740234375,\r
-        "y": 5524.339019775391,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5566.4556884765625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "471b8aca.2d2d8c"\r
+                "10049f5.85364e1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "471b8aca.2d2d8c",\r
+        "id": "10049f5.85364e1",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5892.450927734375,\r
-        "y": 5522.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5564.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "835403d4.ab8a4"\r
+                "72e5612b.857e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d7d3b80.341b3",\r
+        "id": "9c9074e9.bbaff8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5569.951171875,\r
-        "y": 5607.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5649.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "dbe8e8e2.82532"\r
+                "952a99b1.f3f0e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbe8e8e2.82532",\r
+        "id": "952a99b1.f3f0e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 5748.951171875,\r
-        "y": 5623.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5665.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe24638.108ff2",\r
+        "id": "74a77564.40268c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 5730.951171875,\r
-        "y": 5575.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5617.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23127469.8e053c",\r
+        "id": "f64c3a10.6bbc38",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete UNI of ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.rootconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.ROOT.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5279.951171875,\r
-        "y": 5678.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5720.399627685547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2dc53207.e6e746",\r
-                "5dfbf094.3dd5e"\r
+                "cd722628.03685",\r
+                "76458c1b.1a62ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2dc53207.e6e746",\r
+        "id": "cd722628.03685",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5628.451171875,\r
-        "y": 5660.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5702.399627685547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d62622e9.977188"\r
+                "d04dd9dc.2f2dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d62622e9.977188",\r
+        "id": "d04dd9dc.2f2dc8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
         "comments": "",\r
         "x": 5884.451171875,\r
-        "y": 5663.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5705.399627685547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b15c93b0.c4d298",\r
+        "id": "1006a530.30b813",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5836.951171875,\r
-        "y": 5704.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5746.399627685547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5dfbf094.3dd5e",\r
+        "id": "76458c1b.1a62ac",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5638.451171875,\r
-        "y": 5709.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5751.399627685547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b15c93b0.c4d298"\r
+                "1006a530.30b813"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9523ac21.fb27e8",\r
+        "id": "fb4f4697.4dc5f",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.rootconn.access-provider-id + '-clientId-' +\n                                                   $tmp.rootconn.access-client-id + '-topologyId-' +\n                                                   $tmp.rootconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.rootconn.access-node-id`\" />\n",\r
         "comments": "",\r
         "x": 5361.450927734375,\r
-        "y": 5490.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5532.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "835403d4.ab8a4",\r
+        "id": "72e5612b.857e68",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6087.450927734375,\r
-        "y": 5522.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5564.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "44025b35.70e694"\r
+                "3625dda5.38707a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "defb6a74.ad63a8",\r
+        "id": "402ab8f9.3aa18",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 6469.450927734375,\r
-        "y": 5526.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5568.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f54f4ae0.ec5cf",\r
-                "af149106.171db",\r
-                "c5fc8f53.576908"\r
+                "4697e13e.13b02",\r
+                "6c3ba6ac.e7c21",\r
+                "34e0c57a.0e712a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44025b35.70e694",\r
+        "id": "3625dda5.38707a",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6290.450927734375,\r
-        "y": 5526.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5568.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "defb6a74.ad63a8"\r
+                "402ab8f9.3aa18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af149106.171db",\r
+        "id": "6c3ba6ac.e7c21",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6675.450927734375,\r
-        "y": 5539.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5581.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "c7dae6ee.db5f08",\r
-                "40d56e1d.9aacd",\r
-                "1547569.25d2329"\r
+                "2e31a205.2611fe",\r
+                "c9f11bf6.38bb98",\r
+                "99cec3e1.6d2f68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f54f4ae0.ec5cf",\r
+        "id": "4697e13e.13b02",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
         "x": 6705.450927734375,\r
-        "y": 5487.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5529.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c7dae6ee.db5f08",\r
+        "id": "2e31a205.2611fe",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6885.450927734375,\r
-        "y": 5530.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5572.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f0410cd5.fae628"\r
+                "2ba283a1.e08d44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40d56e1d.9aacd",\r
+        "id": "c9f11bf6.38bb98",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6877.450927734375,\r
-        "y": 5585.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5627.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "76b0a417.e1276c"\r
+                "3af9cd94.f12ff2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1547569.25d2329",\r
+        "id": "99cec3e1.6d2f68",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6882.450927734375,\r
-        "y": 5642.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5684.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b3783d48.7ea6c8"\r
+                "c501098b.50507"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3783d48.7ea6c8",\r
+        "id": "c501098b.50507",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 7034.450927734375,\r
-        "y": 5643.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5685.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "76b0a417.e1276c",\r
+        "id": "3af9cd94.f12ff2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 7045.450927734375,\r
-        "y": 5588.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5630.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0410cd5.fae628",\r
+        "id": "2ba283a1.e08d44",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 7029.833251953125,\r
-        "y": 5528.339019775391,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5570.4556884765625,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "4ccba011.1ac588"\r
+                "bca9e0da.72619"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ccba011.1ac588",\r
+        "id": "bca9e0da.72619",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
         "x": 7244.450927734375,\r
-        "y": 5524.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5566.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c5fc8f53.576908",\r
+        "id": "34e0c57a.0e712a",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 6625.450927734375,\r
-        "y": 5603.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5645.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e61de8ad.7030f",\r
+        "id": "9608373.19689c8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3854.88330078125,\r
-        "y": 3492.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3534.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f1f60f7b.897558",\r
-                "9394ecba.bbac2"\r
+                "6e45c64.2629238",\r
+                "354c7fc8.6d8de"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1f60f7b.897558",\r
+        "id": "6e45c64.2629238",\r
         "type": "set",\r
         "name": "set tmp.mmUNI-id-long",\r
         "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
         "x": 4045.466552734375,\r
-        "y": 3435.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3477.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9394ecba.bbac2",\r
+        "id": "354c7fc8.6d8de",\r
         "type": "switchNode",\r
         "name": "switch tmp.mmUNI-id-long != ROOT UNI",\r
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4092.466552734375,\r
-        "y": 3506.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3548.800018310547,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "62b44b4b.e9462c",\r
-                "2e901346.daa35c"\r
+                "6bdb2c16.23fc7c",\r
+                "5820e4e6.95b47c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62b44b4b.e9462c",\r
+        "id": "6bdb2c16.23fc7c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4330.884033203125,\r
-        "y": 3465.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3507.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "646ee476.4b949c"\r
+                "d4fcba65.f8c8f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e901346.daa35c",\r
+        "id": "5820e4e6.95b47c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4337.884246826172,\r
-        "y": 3522.883270263672,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3564.9999389648438,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3444ada9.d2b992"\r
+                "d9ea756c.06e5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "646ee476.4b949c",\r
+        "id": "d4fcba65.f8c8f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4458.884521484375,\r
-        "y": 3461.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3503.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5aebe180.f62f68",\r
+        "id": "cc0c619e.32de58",\r
         "type": "set",\r
         "name": "set tmp.MMonlyHasROOT to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",\r
         "comments": "",\r
         "x": 3314.083251953125,\r
-        "y": 3420.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3462.400115966797,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9c3a9a9.0f7c28",\r
+        "id": "a6af6c62.1a6b5",\r
         "type": "set",\r
         "name": "set tmp.MMonlyHasROOT to FALSE",\r
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",\r
         "comments": "",\r
         "x": 4727.9169921875,\r
-        "y": 3426.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3468.400115966797,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d94f5698.a9e22",\r
+        "id": "811e3163.5710b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4407.6669921875,\r
-        "y": 3942.5,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3984.616668701172,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "eb39fbed.f65188",\r
-                "716ce6ad.3df158"\r
+                "aa9298d8.acde8",\r
+                "a5e5763f.58bb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb39fbed.f65188",\r
+        "id": "aa9298d8.acde8",\r
         "type": "set",\r
         "name": "set tmp.uni.id",\r
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
         "x": 4580.5498046875,\r
-        "y": 3938.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3980.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "716ce6ad.3df158",\r
+        "id": "a5e5763f.58bb2",\r
         "type": "save",\r
         "name": "get uni from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.uni.id\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4583.5498046875,\r
-        "y": 3985.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4027.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7301217f.c40fd8",\r
-                "4b487020.1f862",\r
-                "98e316f7.2a6e38"\r
+                "4df6bcf4.a4f44c",\r
+                "89771ed8.977b78",\r
+                "d1de1d5b.be978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7301217f.c40fd8",\r
+        "id": "4df6bcf4.a4f44c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4755.5498046875,\r
-        "y": 3969.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4011.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8014e6ef.ba6a4"\r
+                "f65d0563.51b9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b487020.1f862",\r
+        "id": "89771ed8.977b78",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4756.040771484375,\r
-        "y": 4014.7337036132812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4056.850372314453,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "98e316f7.2a6e38",\r
+        "id": "d1de1d5b.be978",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4756.5498046875,\r
-        "y": 4055.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4097.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8014e6ef.ba6a4",\r
+        "id": "f65d0563.51b9e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4916.5498046875,\r
-        "y": 3965.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4007.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6c53b06a.be741",\r
-                "6040c967.bc9a38",\r
-                "6b2c883f.aecd1"\r
+                "41e51ce8.c7bbd4",\r
+                "9fcba756.d0c298",\r
+                "99817ef0.1be558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6986f860.3fd24",\r
+        "id": "d2f62a11.bbccd",\r
         "type": "comment",\r
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",\r
         "info": "",\r
         "comments": "",\r
         "x": 5249.5498046875,\r
-        "y": 3896.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3938.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6040c967.bc9a38",\r
+        "id": "9fcba756.d0c298",\r
         "type": "execute",\r
         "name": "execute split id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni-pnfName\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5184.5498046875,\r
-        "y": 3953.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3995.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "93771b2e.0a5438",\r
-                "494eca03.1cc0f4"\r
+                "ad91a307.53dc18",\r
+                "66b6c9a.ce41eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "494eca03.1cc0f4",\r
+        "id": "66b6c9a.ce41eb8",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5407.5498046875,\r
-        "y": 3939.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3981.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "4a647e39.1988"\r
+                "f5696a58.3dcae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93771b2e.0a5438",\r
+        "id": "ad91a307.53dc18",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5409.5498046875,\r
-        "y": 3972.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4014.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3ee6f9fa.cfa80e"\r
+                "cd5f81cd.b325a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a647e39.1988",\r
+        "id": "f5696a58.3dcae",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5555.5498046875,\r
-        "y": 3932.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3974.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d5960946.db6608"\r
+                "520c18e.4c672e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ee6f9fa.cfa80e",\r
+        "id": "cd5f81cd.b325a8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 5552.5498046875,\r
-        "y": 3969.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4011.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d5960946.db6608",\r
+        "id": "520c18e.4c672e8",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.uni.pnf-name' value=\"`$param-prefix-uni-pnfName[0] + '-' +\n                                                   $param-prefix-uni-pnfName[1] + '-' +\n                                                   $param-prefix-uni-pnfName[2] + '-' +\n                                                   $param-prefix-uni-pnfName[3] + '-' +\n                                                   $param-prefix-uni-pnfName[4] + '-' +\n                                                   $param-prefix-uni-pnfName[5] + '-' +\n                                                   $param-prefix-uni-pnfName[6] + '-' +\n                                                   $param-prefix-uni-pnfName[7] + '-' +\n                                                   $param-prefix-uni-pnfName[8]`\" />\n",\r
         "comments": "",\r
         "x": 5732.5498046875,\r
-        "y": 3932.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3974.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6c53b06a.be741",\r
+        "id": "41e51ce8.c7bbd4",\r
         "type": "switchNode",\r
         "name": "switch uni-tp-id-node-part is the same as the LEAF node",\r
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5228.5498046875,\r
-        "y": 4087.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4129.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f825463f.981388",\r
-                "3533ce81.16ad12"\r
+                "f5a5405e.ab64e8",\r
+                "39efe4c8.977e5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f825463f.981388",\r
+        "id": "f5a5405e.ab64e8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5509.5498046875,\r
-        "y": 4064.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4106.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "1f58973d.a6a451"\r
+                "76dcdb2b.58523c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3533ce81.16ad12",\r
+        "id": "39efe4c8.977e5c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5502.5498046875,\r
-        "y": 4123.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4165.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2ae9f04c.19c548"\r
+                "e34b9d00.f34da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f58973d.a6a451",\r
+        "id": "76dcdb2b.58523c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5639.5498046875,\r
-        "y": 4068.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4110.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2ae9f04c.19c548",\r
+        "id": "e34b9d00.f34da8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5644.5498046875,\r
-        "y": 4122.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4164.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9dd58da7.f05d6",\r
-                "c9296d7d.c80358"\r
+                "d870e573.0525d",\r
+                "daec44c5.c4ca2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9dd58da7.f05d6",\r
+        "id": "d870e573.0525d",\r
         "type": "set",\r
         "name": "set no-pce-call",\r
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",\r
         "comments": "",\r
         "x": 5836.5498046875,\r
-        "y": 4089.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4131.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "985a0c89.e3f6d",\r
+        "id": "77e6d570.0136ec",\r
         "type": "set",\r
         "name": "set middle-man-conn",\r
         "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",\r
         "comments": "",\r
         "x": 5852.5498046875,\r
-        "y": 4141.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4183.276336669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9296d7d.c80358",\r
+        "id": "daec44c5.c4ca2",\r
         "type": "set",\r
         "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",\r
         "comments": "",\r
         "x": 5870.83349609375,\r
-        "y": 4210.75,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4252.866668701172,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6b2c883f.aecd1",\r
+        "id": "99817ef0.1be558",\r
         "type": "set",\r
         "name": "set tmp.stillHasUni to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
         "comments": "",\r
         "x": 5147.533203125,\r
-        "y": 4036.64990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4078.766571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7018ac1a.7a3c7c",\r
+        "id": "4a51985e.972e68",\r
         "type": "switchNode",\r
         "name": "switch tmp.stillHasUni?",\r
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 383.7339172363281,\r
-        "y": 5306.849609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5348.966278076172,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d6a83452.cab528",\r
-                "a3cdb153.e05c2"\r
+                "35e41a11.58bd1e",\r
+                "8fea1632.f2d7a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23ec2dfc.6ca3ea",\r
+        "id": "2a89b0c9.686c5",\r
         "type": "save",\r
         "name": "get root uni from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4288.516357421875,\r
-        "y": 5470.7333984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5512.850067138672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "89ccdd98.c0add8",\r
-                "ffd72856.632858",\r
-                "d24e2f90.29ea68"\r
+                "11eb64db.01f3fb",\r
+                "edc304ba.5ec56",\r
+                "e3707812.01b138"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3a3ebb5.52e4d",\r
+        "id": "8fd56902.a16fd8",\r
         "type": "comment",\r
         "name": "Update ROOT UNI's bw -- ALREADY DONE",\r
         "info": "",\r
         "comments": "",\r
         "x": 4286.516845703125,\r
-        "y": 5422.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5464.850311279297,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c0e896d2.f14fd",\r
+        "id": "fe5a805b.6befb8",\r
         "type": "save",\r
         "name": "update ROOT UNI in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4903.5166015625,\r
-        "y": 5540.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5582.850311279297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ffd72856.632858",\r
+        "id": "edc304ba.5ec56",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4506.007568359375,\r
-        "y": 5441.3076171875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5483.424285888672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fe177ef1.d06678"\r
+                "d06cf255.10cad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d24e2f90.29ea68",\r
+        "id": "e3707812.01b138",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4501.5166015625,\r
-        "y": 5485.733581542969,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5527.850250244141,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "632ed866.3f04b8"\r
+                "c2ada4d7.cf23a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe177ef1.d06678",\r
+        "id": "d06cf255.10cad",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
         "x": 4668.5791015625,\r
-        "y": 5440.593322753906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5482.709991455078,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "632ed866.3f04b8",\r
+        "id": "c2ada4d7.cf23a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4669.5166015625,\r
-        "y": 5485.733581542969,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5527.850250244141,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df87890d.bcb5c",\r
+        "id": "487370c3.c16b7",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4666.5166015625,\r
-        "y": 5535.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5577.850311279297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2ff88b2d.295934",\r
-                "c0e896d2.f14fd"\r
+                "6c262f9d.59d16",\r
+                "fe5a805b.6befb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89ccdd98.c0add8",\r
+        "id": "11eb64db.01f3fb",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4497.5166015625,\r
-        "y": 5535.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5577.850311279297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "df87890d.bcb5c"\r
+                "487370c3.c16b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ff88b2d.295934",\r
+        "id": "6c262f9d.59d16",\r
         "type": "set",\r
         "name": "set new bw",\r
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
         "comments": "",\r
         "x": 4859.517578125,\r
-        "y": 5460.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5502.850311279297,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d7f9ad7.0f862c",\r
+        "id": "472764ad.0e5da4",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 5288.216796875,\r
-        "y": 5398.500244140625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5440.616912841797,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b98cd10.6cfb68",\r
+        "id": "a96c5a1a.d66bf",\r
         "type": "save",\r
         "name": "update ROOT connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5314,\r
-        "y": 5440.700439453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5482.817108154297,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d6a83452.cab528",\r
+        "id": "35e41a11.58bd1e",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 567.8836059570312,\r
-        "y": 5357.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5399.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e5624f1d.dbf4b8"\r
+                "49ab1cdc.2b3dfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3cdb153.e05c2",\r
+        "id": "8fea1632.f2d7a",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 550.883544921875,\r
-        "y": 5279.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5321.999969482422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "daa6681.3df0a98"\r
+                "44e1ece4.47debc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7731a568.885cdc",\r
+        "id": "71bd2e28.fdc428",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 679.8833923339844,\r
-        "y": 4366.883026123047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4408.999694824219,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "a5f98ac5.68fe98",\r
-                "74d156ed.4e9f",\r
-                "6135bf6.f11f5c",\r
-                "8458698c.d1be5",\r
-                "6cf7c0fc.18d4e8"\r
+                "ab47ddf.140532",\r
+                "d3485e4a.cbde48",\r
+                "964a9d6b.511ef",\r
+                "58993466.bcba34",\r
+                "b72e55ab.bc6bd8",\r
+                "8d45971b.519e08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5f98ac5.68fe98",\r
+        "id": "ab47ddf.140532",\r
         "type": "set",\r
         "name": "set tmp.leafconn.",\r
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
         "comments": "",\r
         "x": 931.5667419433594,\r
-        "y": 4344.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4387.049499511719,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "155b7716.d28d91",\r
+        "id": "83fd3013.a6f008",\r
         "type": "comment",\r
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
         "info": "",\r
         "comments": "",\r
         "x": 1033.1338806152344,\r
-        "y": 4293.016326904297,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4335.132995605469,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11c710da.f1a09f",\r
+        "id": "8b20d7ab.715e18",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",\r
         "comments": "",\r
         "x": 1140.9837341308594,\r
-        "y": 4374.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4416.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "74d156ed.4e9f",\r
+        "id": "d3485e4a.cbde48",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 911.9837341308594,\r
-        "y": 4463.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4505.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "11c710da.f1a09f",\r
-                "dd611a8.40420e8"\r
+                "8b20d7ab.715e18",\r
+                "3ddce0eb.9cdfd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd611a8.40420e8",\r
+        "id": "3ddce0eb.9cdfd8",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1147.9837341308594,\r
-        "y": 4456.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4498.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2cc9d43.2a3e32c",\r
-                "16f9c9a2.f3e64e",\r
-                "bd113683.3f90e8"\r
+                "c4f933ed.6c6328",\r
+                "c8f61cf.a6fdde",\r
+                "31635596.d79712"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cc9d43.2a3e32c",\r
+        "id": "c4f933ed.6c6328",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1343.4838562011719,\r
-        "y": 4408.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4450.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "30afce54.3b0e7a"\r
+                "40098ed2.4f4dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16f9c9a2.f3e64e",\r
+        "id": "c8f61cf.a6fdde",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1335.4838562011719,\r
-        "y": 4463.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4505.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ca51c401.6ecfa8"\r
+                "8f4995e7.00e5b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30afce54.3b0e7a",\r
+        "id": "40098ed2.4f4dd",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1487.8661804199219,\r
-        "y": 4407.8721923828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4449.988861083984,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "4c495354.afa6a4"\r
+                "4b557dbd.14d794"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c495354.afa6a4",\r
+        "id": "4b557dbd.14d794",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1671.9837341308594,\r
-        "y": 4406.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4448.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "72a0b2fc.d6eab4"\r
+                "a0958afe.9d1b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72a0b2fc.d6eab4",\r
+        "id": "a0958afe.9d1b",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1866.9837341308594,\r
-        "y": 4406.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4448.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3067a2de.bf9096"\r
+                "31026a11.2a4bde"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd113683.3f90e8",\r
+        "id": "31635596.d79712",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1340.4838562011719,\r
-        "y": 4520.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4562.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "c72ac013.478f"\r
+                "c3c84b5.76fc5b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c72ac013.478f",\r
+        "id": "c3c84b5.76fc5b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 1492.4838562011719,\r
-        "y": 4521.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4563.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ca51c401.6ecfa8",\r
+        "id": "8f4995e7.00e5b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 1503.4838562011719,\r
-        "y": 4464.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4506.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fae6bda1.4d6a28",\r
+        "id": "ca7cc65e.e299b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2248.9837341308594,\r
-        "y": 4410.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4452.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5ada214d.6d6df",\r
-                "230404bc.0330d4",\r
-                "8f5a3f0d.286f38"\r
+                "7e1000fc.f7ace",\r
+                "10f0f2b8.28ecdd",\r
+                "1cf608fc.280f8f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3067a2de.bf9096",\r
+        "id": "31026a11.2a4bde",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2069.9837341308594,\r
-        "y": 4410.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4452.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fae6bda1.4d6a28"\r
+                "ca7cc65e.e299b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6135bf6.f11f5c",\r
+        "id": "964a9d6b.511ef",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1053.4839782714844,\r
-        "y": 4567.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4609.932800292969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "63ad904f.f883c",\r
-                "612437fd.ee8ae"\r
+                "a14b7306.f0f088",\r
+                "edc3d42b.21d3d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "612437fd.ee8ae",\r
+        "id": "edc3d42b.21d3d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1417.9837341308594,\r
-        "y": 4615.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4657.932800292969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7222d332.cab804"\r
+                "7d2a7da9.46fdfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63ad904f.f883c",\r
+        "id": "a14b7306.f0f088",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1413.9837341308594,\r
-        "y": 4575.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4617.932800292969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ffb15b5f.69bdb"\r
+                "db3e9725.884648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffb15b5f.69bdb",\r
+        "id": "db3e9725.884648",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
         "comments": "",\r
         "x": 1571.9837341308594,\r
-        "y": 4575.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4617.932800292969,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7222d332.cab804",\r
+        "id": "7d2a7da9.46fdfc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1575.4837341308594,\r
-        "y": 4615.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4657.932800292969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "230404bc.0330d4",\r
+        "id": "10f0f2b8.28ecdd",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2454.9837341308594,\r
-        "y": 4423.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4465.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "999c0ecf.dd9428",\r
-                "cadc4a62.3f428",\r
-                "9a118cc2.6cef58"\r
+                "25e5e61.acf541a",\r
+                "12a14aa1.cf2fb5",\r
+                "c1a2b3a0.8c75c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ada214d.6d6df",\r
+        "id": "7e1000fc.f7ace",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
         "x": 2484.9837341308594,\r
-        "y": 4371.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4413.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "999c0ecf.dd9428",\r
+        "id": "25e5e61.acf541a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2664.9837341308594,\r
-        "y": 4414.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4456.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fb522408.bea2a8"\r
+                "5696d51e.dbfe64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cadc4a62.3f428",\r
+        "id": "12a14aa1.cf2fb5",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2656.9837341308594,\r
-        "y": 4469.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4511.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ad21cc41.8772b"\r
+                "8d572a45.011df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a118cc2.6cef58",\r
+        "id": "c1a2b3a0.8c75c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2661.9837341308594,\r
-        "y": 4526.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4568.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e3096426.02dcf"\r
+                "dddace6e.f9e9f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3096426.02dcf",\r
+        "id": "dddace6e.f9e9f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 2813.9837341308594,\r
-        "y": 4527.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4569.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad21cc41.8772b",\r
+        "id": "8d572a45.011df8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 2824.9837341308594,\r
-        "y": 4472.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4514.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fb522408.bea2a8",\r
+        "id": "5696d51e.dbfe64",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2809.3660583496094,\r
-        "y": 4411.8721923828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4453.988861083984,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6e503f35.5790c"\r
+                "e4cea83c.4d71a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e503f35.5790c",\r
+        "id": "e4cea83c.4d71a",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
         "x": 3023.9837341308594,\r
-        "y": 4408.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4450.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f5a3f0d.286f38",\r
+        "id": "1cf608fc.280f8f",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2404.9837341308594,\r
-        "y": 4487.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4529.333190917969,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8458698c.d1be5",\r
+        "id": "58993466.bcba34",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1082.5667419433594,\r
-        "y": 4787.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4830.049499511719,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6cf7c0fc.18d4e8",\r
+        "id": "b72e55ab.bc6bd8",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 897.5667419433594,\r
-        "y": 4854.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4897.049499511719,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "31c266e8.6cad22",\r
-                "45786f9e.46f928"\r
+                "191ee334.0f09fd",\r
+                "b8911820.2c8f68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31c266e8.6cad22",\r
+        "id": "191ee334.0f09fd",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1162.5667419433594,\r
-        "y": 4839.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4882.049499511719,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "25e4293a.b5a0de"\r
+                "328aa2d2.c36a96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45786f9e.46f928",\r
+        "id": "b8911820.2c8f68",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1158.5667419433594,\r
-        "y": 4887.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4930.049499511719,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9325c5b6.3d913"\r
+                "88b54a6f.ba3898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25e4293a.b5a0de",\r
+        "id": "328aa2d2.c36a96",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1318.5667419433594,\r
-        "y": 4835.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4878.049499511719,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "51a35a4f.5fbc64"\r
+                "4a7a1b00.5fe524"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9325c5b6.3d913",\r
+        "id": "88b54a6f.ba3898",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
         "comments": "",\r
         "x": 1306.5667419433594,\r
-        "y": 4882.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4925.049499511719,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c5019df.72c63e",\r
+        "id": "d5cdb27.e4e575",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 1587.4664001464844,\r
-        "y": 4786.633026123047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4828.749694824219,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "51a35a4f.5fbc64",\r
+        "id": "4a7a1b00.5fe524",\r
         "type": "save",\r
         "name": "update ROOT connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1613.2496032714844,\r
-        "y": 4828.833221435547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4870.949890136719,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cbb82af5.87b298",\r
+        "id": "1003b628.8cf272",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1026.8833923339844,\r
-        "y": 4102.199920654297,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4144.316589355469,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "daa6681.3df0a98",\r
+        "id": "44e1ece4.47debc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 632.8834228515625,\r
-        "y": 4106.883056640625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4148.999725341797,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "cbb82af5.87b298",\r
-                "7731a568.885cdc"\r
+                "1003b628.8cf272",\r
+                "71bd2e28.fdc428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5624f1d.dbf4b8",\r
+        "id": "49ab1cdc.2b3dfc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 716.3333740234375,\r
-        "y": 5359.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5401.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "16338b46.5dad65",\r
-                "de535c52.af9d48",\r
-                "78064cf.4874bb4",\r
-                "b5448cca.f23df8"\r
+                "723c2903.f58428",\r
+                "98b88954.793148",\r
+                "b393338f.3c0a5",\r
+                "119574e6.129413"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16338b46.5dad65",\r
+        "id": "723c2903.f58428",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1067.7166748046875,\r
-        "y": 5290.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5332.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "de535c52.af9d48",\r
+        "id": "98b88954.793148",\r
         "type": "save",\r
         "name": "delete LEAF connectivity resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 978.7166748046875,\r
-        "y": 5359.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5401.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "78064cf.4874bb4",\r
+        "id": "b393338f.3c0a5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 869.88330078125,\r
-        "y": 5594.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5636.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "69415165.a30268",\r
-                "38b5cafd.d5079e",\r
-                "6a408110.2a2dc"\r
+                "df7f814b.30dca",\r
+                "680a6c2d.c81304",\r
+                "f02d2a13.d0aa48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f703a5f3.1124f8",\r
+        "id": "c8c4cb96.f9d8b",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2585.882568359375,\r
-        "y": 5481.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5523.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2bcfefd4.8f246",\r
-                "6262f33a.13ed54",\r
-                "5f5183a2.3dd5bc"\r
+                "43900724.7021a8",\r
+                "b5fd98a.36736e8",\r
+                "3c26b3f8.230acc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17938acf.263b45",\r
+        "id": "de9e1e1d.dcbc3",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2535.882568359375,\r
-        "y": 5545.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5587.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "434194f6.d45944",\r
+        "id": "d2b1cccb.1f5468",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
         "x": 2615.882568359375,\r
-        "y": 5429.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5471.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2bcfefd4.8f246",\r
+        "id": "43900724.7021a8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2795.882568359375,\r
-        "y": 5472.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5514.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f6e068a.7d61a18"\r
+                "dc7a8a3b.a925f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6262f33a.13ed54",\r
+        "id": "b5fd98a.36736e8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2787.882568359375,\r
-        "y": 5527.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5569.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2a0eede1.27db52"\r
+                "c1ab7307.8305a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f5183a2.3dd5bc",\r
+        "id": "3c26b3f8.230acc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2792.882568359375,\r
-        "y": 5584.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5626.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "612a7284.deceac"\r
+                "f1d869f8.b644e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "612a7284.deceac",\r
+        "id": "f1d869f8.b644e",\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": 2944.882568359375,\r
-        "y": 5585.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5627.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a0eede1.27db52",\r
+        "id": "c1ab7307.8305a8",\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": 2955.882568359375,\r
-        "y": 5530.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5572.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f6e068a.7d61a18",\r
+        "id": "dc7a8a3b.a925f8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2940.264892578125,\r
-        "y": 5470.055572509766,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5512.1722412109375,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d3b91b08.9e326"\r
+                "99f651cc.e3a158"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3b91b08.9e326",\r
+        "id": "99f651cc.e3a158",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
         "x": 3154.882568359375,\r
-        "y": 5466.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5508.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "69415165.a30268",\r
+        "id": "df7f814b.30dca",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.the-connectivity.access-node-id`\" />\n",\r
         "comments": "",\r
         "x": 1151.88330078125,\r
-        "y": 5463.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5505.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5cd94a05.12a97c",\r
+        "id": "1d552db6.d6aaca",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1362.3834228515625,\r
-        "y": 5602.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5644.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6b54e983.54f23"\r
+                "2d69161c.7523aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7cfb8601.d6c8b8",\r
+        "id": "d7946986.6d0968",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1365.3834228515625,\r
-        "y": 5490.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5532.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "43d9e97c.41e918"\r
+                "b24f95b.8630968"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c076204a.7c8658",\r
+        "id": "9ea8b87c.75f8b",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1357.3834228515625,\r
-        "y": 5545.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5587.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "697ce13c.463e78"\r
+                "d1cfde55.05efd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43d9e97c.41e918",\r
+        "id": "b24f95b.8630968",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1499.765625,\r
-        "y": 5485.0556640625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5527.172332763672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9ea73f48.e6dc88"\r
+                "57f5a4ed.934544"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b54e983.54f23",\r
+        "id": "2d69161c.7523aa",\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": 1514.3834228515625,\r
-        "y": 5603.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5645.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "697ce13c.463e78",\r
+        "id": "d1cfde55.05efd",\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": 1525.3834228515625,\r
-        "y": 5546.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5588.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ea73f48.e6dc88",\r
+        "id": "57f5a4ed.934544",\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": 1686.8828125,\r
-        "y": 5486.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5528.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8867a67f.02b388"\r
+                "489e94a0.cb0724"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8867a67f.02b388",\r
+        "id": "489e94a0.cb0724",\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": 1914.8828125,\r
-        "y": 5479.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5521.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "bfd4d2af.8ab0b8"\r
+                "70d2a39a.39c914"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38b5cafd.d5079e",\r
+        "id": "680a6c2d.c81304",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1169.88330078125,\r
-        "y": 5538.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5580.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "5cd94a05.12a97c",\r
-                "7cfb8601.d6c8b8",\r
-                "c076204a.7c8658"\r
+                "1d552db6.d6aaca",\r
+                "d7946986.6d0968",\r
+                "9ea8b87c.75f8b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfd4d2af.8ab0b8",\r
+        "id": "70d2a39a.39c914",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2120.8828125,\r
-        "y": 5476.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5518.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b0cdfdee.4e9418"\r
+                "11f0110f.f1cbd7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0cdfdee.4e9418",\r
+        "id": "11f0110f.f1cbd7",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2335.8822021484375,\r
-        "y": 5479.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5521.516571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "434194f6.d45944",\r
-                "f703a5f3.1124f8",\r
-                "17938acf.263b45"\r
+                "d2b1cccb.1f5468",\r
+                "c8c4cb96.f9d8b",\r
+                "de9e1e1d.dcbc3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a408110.2a2dc",\r
+        "id": "f02d2a13.d0aa48",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete LEAF ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.the-connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1293.6500244140625,\r
-        "y": 5687.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5729.916473388672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "d58ed713.3cd0d",\r
-                "e5f89511.dafe58"\r
+                "73cc7454.46b21c",\r
+                "983cf462.7773e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d58ed713.3cd0d",\r
+        "id": "73cc7454.46b21c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1640.1500244140625,\r
-        "y": 5680.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5722.916473388672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "8ee30019.6f667"\r
+                "d64e37c.99aa9c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5f89511.dafe58",\r
+        "id": "983cf462.7773e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1644.1500244140625,\r
-        "y": 5720.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5762.916473388672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3308ecad.5ad59c"\r
+                "63d68d1b.26356c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ee30019.6f667",\r
+        "id": "d64e37c.99aa9c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
         "comments": "",\r
         "x": 1798.1500244140625,\r
-        "y": 5680.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5722.916473388672,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3308ecad.5ad59c",\r
+        "id": "63d68d1b.26356c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1801.6500244140625,\r
-        "y": 5720.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5762.916473388672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b5448cca.f23df8",\r
+        "id": "119574e6.129413",\r
         "type": "switchNode",\r
         "name": "switch tmp.MMstillHasUni?",\r
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 913.183349609375,\r
-        "y": 5849.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5891.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "59551d1d.12689c",\r
-                "5a5ae31.cb9b99c"\r
+                "20383b77.9d13bc",\r
+                "9b5788ce.9c9408"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59551d1d.12689c",\r
+        "id": "20383b77.9d13bc",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1105.183349609375,\r
-        "y": 5826.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5868.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2e2794d8.3df39c"\r
+                "c8a5ff15.a0cc5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a5ae31.cb9b99c",\r
+        "id": "9b5788ce.9c9408",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1093.3500366210938,\r
-        "y": 5999.2001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6041.316864013672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6dce893f.c421c"\r
+                "80ab1272.8cacd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e2794d8.3df39c",\r
+        "id": "c8a5ff15.a0cc5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1253.35009765625,\r
-        "y": 5826.2001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5868.316864013672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b4e9d461.c3c1a",\r
-                "2f3efa95.41d3ce"\r
+                "b646edcc.5849d8",\r
+                "7aaef741.32dd88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4e9d461.c3c1a",\r
+        "id": "b646edcc.5849d8",\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": 1675.199951171875,\r
-        "y": 5797.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5839.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2f3efa95.41d3ce",\r
+        "id": "7aaef741.32dd88",\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": 1490.199951171875,\r
-        "y": 5864.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5906.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "aadc3189.147b98",\r
-                "9801a2d7.df3f98"\r
+                "f0373e80.9f5c1",\r
+                "17b9923a.e6ff36"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aadc3189.147b98",\r
+        "id": "f0373e80.9f5c1",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1755.199951171875,\r
-        "y": 5849.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5891.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "aaac06aa.f3d728"\r
+                "ea0794c3.5caad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9801a2d7.df3f98",\r
+        "id": "17b9923a.e6ff36",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1751.199951171875,\r
-        "y": 5897.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5939.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "7656a3d7.b7266c"\r
+                "f785b40a.2c0f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aaac06aa.f3d728",\r
+        "id": "ea0794c3.5caad8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1911.199951171875,\r
-        "y": 5845.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5887.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "2673ca00.ba724e"\r
+                "c184cafd.df5108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7656a3d7.b7266c",\r
+        "id": "f785b40a.2c0f08",\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": 1899.199951171875,\r
-        "y": 5892.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5934.716766357422,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2673ca00.ba724e",\r
+        "id": "c184cafd.df5108",\r
         "type": "save",\r
         "name": "update ROOT connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2219.8826904296875,\r
-        "y": 5839.50048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5881.617156982422,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bfaf6549.13fe88",\r
+        "id": "c1da52d9.9cf468",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 2194.0994873046875,\r
-        "y": 5797.30029296875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5839.416961669922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6dce893f.c421c",\r
+        "id": "80ab1272.8cacd",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1230.916748046875,\r
-        "y": 5998.5,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6040.616668701172,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "75d82528.4dd5bc",\r
-                "24c2da43.974556"\r
+                "49431e5b.e46588",\r
+                "1475339.a9ed04c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75d82528.4dd5bc",\r
+        "id": "49431e5b.e46588",\r
         "type": "for",\r
         "name": "for each relationship of middle-man-conn",\r
         "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1544.23291015625,\r
-        "y": 5992.7001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6034.816864013672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "29eb94d3.70f2dc"\r
+                "f57bdc9.9ead4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29eb94d3.70f2dc",\r
+        "id": "f57bdc9.9ead4a",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1844.566650390625,\r
-        "y": 5987.700134277344,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6029.816802978516,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "522c88bc.33b518"\r
+                "ba35dccb.3b6bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "522c88bc.33b518",\r
+        "id": "ba35dccb.3b6bb8",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2024.2332763671875,\r
-        "y": 5987.700225830078,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6029.81689453125,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9dde3a26.bf1a48"\r
+                "86341ec4.ccb728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9dde3a26.bf1a48",\r
+        "id": "86341ec4.ccb728",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2224.233154296875,\r
-        "y": 5987.7001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6029.816864013672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "af210146.805c98",\r
-                "1304e1a7.407dde",\r
-                "83b6e70e.c6339"\r
+                "73b15a95.c45e6c",\r
+                "577c89f1.70257",\r
+                "ebf7b15b.49862"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af210146.805c98",\r
+        "id": "73b15a95.c45e6c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2431.23291015625,\r
-        "y": 6037.7001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6079.816864013672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "bfbb5b5d.76ea48"\r
+                "d5e5b35.6604c5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24e402f2.8a6b26",\r
+        "id": "925dd5ef.2fc678",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2408.466552734375,\r
-        "y": 6221.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6264.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3ff65d5b.44eb62",\r
-                "d09102d1.fb466",\r
-                "3d724c56.f2b6cc"\r
+                "42725353.b4a374",\r
+                "1745f7ad.eada2",\r
+                "ebfc9334.bdf468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cd695fe.f2c6f2",\r
+        "id": "6ac4c475.ce37cc",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1607.466552734375,\r
-        "y": 6136.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6179.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "74367c85.fa02dc"\r
+                "df9efed7.82417"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74367c85.fa02dc",\r
+        "id": "df9efed7.82417",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1804.466552734375,\r
-        "y": 6150.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6193.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "572f2125.6367b8",\r
-                "5931a81f.41a6"\r
+                "376f554a.32ded2",\r
+                "e86a8d88.08809"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "572f2125.6367b8",\r
+        "id": "376f554a.32ded2",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1972.466552734375,\r
-        "y": 6143.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6186.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "22fa9a36.31302e"\r
+                "bc2d7c0c.7cc4a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22fa9a36.31302e",\r
+        "id": "bc2d7c0c.7cc4a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2135.466552734375,\r
-        "y": 6143.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6186.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "24e402f2.8a6b26"\r
+                "925dd5ef.2fc678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5931a81f.41a6",\r
+        "id": "e86a8d88.08809",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1988.466552734375,\r
-        "y": 6439.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6482.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "510edb34.612754"\r
+                "32fa6a7d.612076"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "510edb34.612754",\r
+        "id": "32fa6a7d.612076",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2151.466552734375,\r
-        "y": 6439.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6482.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "4c0113a.98542ec"\r
+                "6e62ca.5284a538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c0113a.98542ec",\r
+        "id": "6e62ca.5284a538",\r
         "type": "save",\r
         "name": "delete uni resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2394.466552734375,\r
-        "y": 6439.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6482.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2b555ba8.ce83e4",\r
+        "id": "91368e45.2e3cd8",\r
         "type": "save",\r
         "name": "delete connectivity resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648.466552734375,\r
-        "y": 6583.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1362.466552734375,\r
+        "y": 7248.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bfbb5b5d.76ea48",\r
+        "id": "d5e5b35.6604c5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1433.466552734375,\r
-        "y": 6134.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6177.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "1cd695fe.f2c6f2",\r
-                "2b555ba8.ce83e4"\r
+                "6ac4c475.ce37cc",\r
+                "91368e45.2e3cd8",\r
+                "5c661b6d.db566c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ff65d5b.44eb62",\r
+        "id": "42725353.b4a374",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2619.466552734375,\r
-        "y": 6223.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6266.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "851525d6.b90c38"\r
+                "aedd4240.642968"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d09102d1.fb466",\r
+        "id": "1745f7ad.eada2",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2619.95751953125,\r
-        "y": 6269.473937988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6311.590606689453,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "74e6774b.c7b358"\r
+                "6425bc45.5cdfcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d724c56.f2b6cc",\r
+        "id": "ebfc9334.bdf468",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2617.466552734375,\r
-        "y": 6312.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6355.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "cbe3afce.930cc"\r
+                "337169e1.665c2e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83b6e70e.c6339",\r
+        "id": "ebf7b15b.49862",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2455.282958984375,\r
-        "y": 5938.5,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5980.616668701172,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1304e1a7.407dde",\r
+        "id": "577c89f1.70257",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2452.7919921875,\r
-        "y": 5981.925964355469,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6024.042633056641,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "24c2da43.974556",\r
+        "id": "1475339.a9ed04c",\r
         "type": "save",\r
         "name": "delete middle-man-conn resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1531.400146484375,\r
-        "y": 6067.2998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6109.416473388672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "851525d6.b90c38",\r
+        "id": "aedd4240.642968",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2785.466552734375,\r
-        "y": 6213.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6256.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "811dd566.85ec38",\r
-                "6a877b95.f2661c",\r
-                "66415a60.9e5d9c",\r
-                "a662df33.5b8808",\r
-                "502ecc67.91354c"\r
+                "20a20b24.b18d74",\r
+                "da0ac321.ebd92",\r
+                "450533a8.9c748c",\r
+                "dc80e7d7.692bf8",\r
+                "7b453ddd.4a4edc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbe3afce.930cc",\r
+        "id": "337169e1.665c2e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 2784.466552734375,\r
-        "y": 6311.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6354.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "74e6774b.c7b358",\r
+        "id": "6425bc45.5cdfcc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
         "x": 2782.5289306640625,\r
-        "y": 6269.759674072266,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6311.8763427734375,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "811dd566.85ec38",\r
+        "id": "20a20b24.b18d74",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
         "comments": "",\r
         "x": 3007.466552734375,\r
-        "y": 5931.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5974.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a877b95.f2661c",\r
+        "id": "da0ac321.ebd92",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3033.466552734375,\r
-        "y": 6048.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6091.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "3d9fd486.323a64",\r
-                "c6247afb.9c0a",\r
-                "83cc8360.81d358"\r
+                "ab328def.9c2568",\r
+                "1e0d49ce.54650e",\r
+                "83f96b0e.23503"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66415a60.9e5d9c",\r
+        "id": "450533a8.9c748c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3136.466552734375,\r
-        "y": 6315.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6358.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "9c554475.661fc8",\r
-                "12ed9938.83ebcf"\r
+                "e189248a.5308d8",\r
+                "42e13b38.68927c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a662df33.5b8808",\r
+        "id": "dc80e7d7.692bf8",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3074.466552734375,\r
-        "y": 6450.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6493.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b26d88bf.bd178",\r
-                "f451c5d.6b3dd38"\r
+                "75c39310.64e10c",\r
+                "865b2c0.812e658"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "502ecc67.91354c",\r
+        "id": "7b453ddd.4a4edc",\r
         "type": "save",\r
         "name": "delete vpn-binding resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3055.466552734375,\r
-        "y": 6566.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6609.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3d9fd486.323a64",\r
+        "id": "ab328def.9c2568",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3228.9666748046875,\r
-        "y": 6000.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6043.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "c715af9f.c55108"\r
+                "7b2173a0.a25f4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6247afb.9c0a",\r
+        "id": "1e0d49ce.54650e",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3220.9666748046875,\r
-        "y": 6055.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6098.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "f990360c.2a7d88"\r
+                "3e21d08a.9cf2d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c715af9f.c55108",\r
+        "id": "7b2173a0.a25f4c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3363.348876953125,\r
-        "y": 5995.5556640625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6037.672332763672,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "cf5a3a9d.68d89"\r
+                "d783eb8.e8d4418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83cc8360.81d358",\r
+        "id": "83f96b0e.23503",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3225.9666748046875,\r
-        "y": 6112.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6155.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "ee6f1ffb.7dcfe"\r
+                "39d187f7.387c08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee6f1ffb.7dcfe",\r
+        "id": "39d187f7.387c08",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 3377.9666748046875,\r
-        "y": 6113.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6156.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f990360c.2a7d88",\r
+        "id": "3e21d08a.9cf2d8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 3388.9666748046875,\r
-        "y": 6056.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6099.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f451c5d.6b3dd38",\r
+        "id": "865b2c0.812e658",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3327.466552734375,\r
-        "y": 6428.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6471.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e38cfd76.3f8a2"\r
+                "772ac851.ed388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b26d88bf.bd178",\r
+        "id": "75c39310.64e10c",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3327.466552734375,\r
-        "y": 6484.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6527.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cf5a3a9d.68d89",\r
+        "id": "d783eb8.e8d4418",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3550.466064453125,\r
-        "y": 5996.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6039.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "fe7eff92.d565e"\r
+                "22737809.d5a598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe7eff92.d565e",\r
+        "id": "22737809.d5a598",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3791.466064453125,\r
-        "y": 5987.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6030.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "a5619f8.2b7e86"\r
+                "8e816736.3f1518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e38cfd76.3f8a2",\r
+        "id": "772ac851.ed388",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3677.466064453125,\r
-        "y": 6418.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6461.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "1d52efad.f9e5d",\r
-                "d7169143.c010d8"\r
+                "7e278410.d4a45c",\r
+                "5323d43d.ae4a94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c554475.661fc8",\r
+        "id": "e189248a.5308d8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3443.966064453125,\r
-        "y": 6340.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6383.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "238545c1.5c8b2a"\r
+                "a38fc7bd.ddbeb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12ed9938.83ebcf",\r
+        "id": "42e13b38.68927c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3444.966064453125,\r
-        "y": 6285.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6328.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "bb0795de.a47f18"\r
+                "ca98e797.f9c13"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "238545c1.5c8b2a",\r
+        "id": "a38fc7bd.ddbeb",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",\r
         "comments": "",\r
         "x": 3615.966064453125,\r
-        "y": 6338.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6381.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb0795de.a47f18",\r
+        "id": "ca98e797.f9c13",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3612.466064453125,\r
-        "y": 6287.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6330.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "36cf22b4.4935d6",\r
+        "id": "63dcc10.1e934c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4148.4658203125,\r
-        "y": 5936.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5979.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b5cbacbc.c392",\r
-                "ea40936a.af6178",\r
-                "6eb0462c.852488"\r
+                "cb51edb2.a6957",\r
+                "7da0f639.3db538",\r
+                "dfe02514.308cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5619f8.2b7e86",\r
+        "id": "8e816736.3f1518",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3997.466064453125,\r
-        "y": 5984.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6027.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "36cf22b4.4935d6"\r
+                "63dcc10.1e934c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d52efad.f9e5d",\r
+        "id": "7e278410.d4a45c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4009.966064453125,\r
-        "y": 6392.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6435.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "6bd1cb72.9cf9b4"\r
+                "21b3d920.ac879e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7169143.c010d8",\r
+        "id": "5323d43d.ae4a94",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4013.966064453125,\r
-        "y": 6432.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6475.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "e4332941.104e"\r
+                "da782471.0e218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4332941.104e",\r
+        "id": "da782471.0e218",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4201.466064453125,\r
-        "y": 6436.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6479.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6bd1cb72.9cf9b4",\r
+        "id": "21b3d920.ac879e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
         "comments": "",\r
         "x": 4197.966064453125,\r
-        "y": 6396.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6439.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea40936a.af6178",\r
+        "id": "7da0f639.3db538",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4354.4658203125,\r
-        "y": 5949.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5992.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "914dea7f.0edbe",\r
-                "82561c7b.09ef28",\r
-                "b047cbfd.3b9618"\r
+                "2a4fa91b.b928a6",\r
+                "3708f6c9.39ed2a",\r
+                "7ad7cb3f.866b74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5cbacbc.c392",\r
+        "id": "cb51edb2.a6957",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
         "x": 4384.4658203125,\r
-        "y": 5897.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5940.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "914dea7f.0edbe",\r
+        "id": "2a4fa91b.b928a6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4564.4658203125,\r
-        "y": 5940.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5983.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "c318baba.3a4cc8"\r
+                "bee63261.4dfe28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82561c7b.09ef28",\r
+        "id": "3708f6c9.39ed2a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4556.4658203125,\r
-        "y": 5995.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6038.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "b8e7878b.f1ad7"\r
+                "9ceb2b97.8189"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b047cbfd.3b9618",\r
+        "id": "7ad7cb3f.866b74",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4561.4658203125,\r
-        "y": 6052.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6095.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "c15a7782.9625b"\r
+                "84d1d52.6203b28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6eb0462c.852488",\r
+        "id": "dfe02514.308cd",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4304.4658203125,\r
-        "y": 6013.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6056.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c15a7782.9625b",\r
+        "id": "84d1d52.6203b28",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 4713.4658203125,\r
-        "y": 6053.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6096.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b8e7878b.f1ad7",\r
+        "id": "9ceb2b97.8189",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
         "x": 4724.4658203125,\r
-        "y": 5998.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6041.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c318baba.3a4cc8",\r
+        "id": "bee63261.4dfe28",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4708.84814453125,\r
-        "y": 5938.555572509766,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5980.6722412109375,\r
+        "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "42376e75.44b2d8"\r
+                "595ecbb0.cd7dfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42376e75.44b2d8",\r
+        "id": "595ecbb0.cd7dfc",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
         "x": 4923.4658203125,\r
-        "y": 5934.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5977.016571044922,\r
+        "z": "d1eceead.adafe",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "e8d2c16f.36acb",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",\r
+        "comments": "",\r
+        "x": 1659.2332763671875,\r
+        "y": 6774.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "656fa541.af35f4",\r
+        "type": "get-resource",\r
+        "name": "get-resource src pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1685.2332763671875,\r
+        "y": 6891.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "35de354f.e14d62",\r
+                "aedf728e.4bd508",\r
+                "d65aa6c1.4a58e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "35de354f.e14d62",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1880.7333984375,\r
+        "y": 6843.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "5345535d.1f34d4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "aedf728e.4bd508",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1872.7333984375,\r
+        "y": 6898.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "20bec1fa.80674e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5345535d.1f34d4",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2015.1156005859375,\r
+        "y": 6838.272430419922,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "eb473582.da829"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d65aa6c1.4a58e",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1877.7333984375,\r
+        "y": 6955.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "15a64cb6.b20343"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "15a64cb6.b20343",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 2029.7333984375,\r
+        "y": 6956.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "20bec1fa.80674e",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 2040.7333984375,\r
+        "y": 6899.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "eb473582.da829",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2202.2327880859375,\r
+        "y": 6839.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "b73dec8d.f89198"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b73dec8d.f89198",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2443.2327880859375,\r
+        "y": 6830.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "1ceb2f26.68ec79"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8e7e1d35.45d4c8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2800.2325439453125,\r
+        "y": 6779.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "a1ade3fe.d4148",\r
+                "2a08582e.e9a11",\r
+                "a2d9c162.524c1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1ceb2f26.68ec79",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2649.2327880859375,\r
+        "y": 6827.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "8e7e1d35.45d4c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2a08582e.e9a11",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3006.2325439453125,\r
+        "y": 6792.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "cc4e4323.ff0c8",\r
+                "37454266.958e06",\r
+                "fc54918e.b07f78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a2d9c162.524c1",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 2956.2325439453125,\r
+        "y": 6856.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a1ade3fe.d4148",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domain id",\r
+        "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 3036.2325439453125,\r
+        "y": 6740.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cc4e4323.ff0c8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3216.2325439453125,\r
+        "y": 6783.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "e3f7ab37.cd3338"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "37454266.958e06",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3208.2325439453125,\r
+        "y": 6838.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "c423f303.cf0fc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fc54918e.b07f78",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3213.2325439453125,\r
+        "y": 6895.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "f7cc4fee.3d03d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f7cc4fee.3d03d8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 3365.2325439453125,\r
+        "y": 6896.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c423f303.cf0fc",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 3376.2325439453125,\r
+        "y": 6841.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e3f7ab37.cd3338",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3360.6148681640625,\r
+        "y": 6781.2723388671875,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "a32f770f.0bf93"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a32f770f.0bf93",\r
+        "type": "set",\r
+        "name": "set controller domain data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
+        "comments": "",\r
+        "x": 3575.2325439453125,\r
+        "y": 6777.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5c661b6d.db566c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1451.2332763671875,\r
+        "y": 6902.616668701172,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "e8d2c16f.36acb",\r
+                "656fa541.af35f4",\r
+                "f25051a6.fa4e28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f25051a6.fa4e28",\r
+        "type": "switchNode",\r
+        "name": "switch connectivity has ethernet service",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1733.433349609375,\r
+        "y": 7043.816864013672,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "81385ecf.138098",\r
+                "de989c54.09997"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "de989c54.09997",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1986.433349609375,\r
+        "y": 7021.816864013672,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "78a6b529.99c6a4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "81385ecf.138098",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1986.433349609375,\r
+        "y": 7077.816864013672,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "78a6b529.99c6a4",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Delete ethernet Service without token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2336.432861328125,\r
+        "y": 7011.816864013672,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "a19873b6.a4d6e",\r
+                "94634cdd.23be6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a19873b6.a4d6e",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2668.932861328125,\r
+        "y": 6985.816864013672,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "2dad16ef.224d22"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "94634cdd.23be6",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2672.932861328125,\r
+        "y": 7025.816864013672,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "4ffd9da0.18218c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4ffd9da0.18218c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2860.432861328125,\r
+        "y": 7029.816864013672,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "2dad16ef.224d22",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
+        "comments": "",\r
+        "x": 2856.932861328125,\r
+        "y": 6989.816864013672,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8d45971b.519e08",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1089.25,\r
+        "y": 4729.39990234375,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "5dcba2e4.9fe114",\r
+                "1fae83d7.8f54e4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5dcba2e4.9fe114",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1517.749755859375,\r
+        "y": 4717.39990234375,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "504ce75b.b6442"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1fae83d7.8f54e4",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1521.749755859375,\r
+        "y": 4757.39990234375,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "2463a8bc.d76748"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "504ce75b.b6442",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
+        "comments": "",\r
+        "x": 1675.749755859375,\r
+        "y": 4717.39990234375,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2463a8bc.d76748",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1679.249755859375,\r
+        "y": 4757.39990234375,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            []\r
+        ]\r
     }\r
 ]
\ No newline at end of file
index a155f74..2e224be 100644 (file)
                 <!--                                             $tmp.source.ttp-id`" />-->
                 <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
             </set>
-            <block>
-                <set>
-                    <parameter name='tmp.aai.all-vpn-bindings.' value='' />
-                </set>
-                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                              resource="vpn-bindings"
-                              key="selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings"
-                              local-only="false"
-                              pfx="tmp.aai.all-vpn-bindings" >
-                    <outcome value='success'>
-                        <block atomic="true">
-                            <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >
-                                <block atomic='true'>
-                                    <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `">
-                                        <outcome value='true'>
-                                            <block atomic="true">
-                                                <set>
-                                                    <parameter name='tmp.aai.vpn-binding.' value="" />
-                                                </set>
-                                                <set>
-                                                    <parameter name='tmp.aai.vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                </set>
-                                                <set>
-                                                    <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+            <for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >
+                <switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>
+                    <outcome value='connectivity'>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                      resource="connectivity"
+                                      key="connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                      local-only="false"
+                                      pfx="tmp.aai.connectivity" >
+                            <outcome value='not-found'></outcome>
+                            <outcome value='failure'></outcome>
+                            <outcome value='success'>
+                                <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='vpn-binding'>
+                                                <block atomic="true">
+                                                    <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='success'>
+                                                            <block atomic='true'>
+                                                                <switch test="`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `">
+                                                                    <outcome value='true'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='tmp.underlayOTN' value="`$tmp.aai.vpn-binding.vpn-name`" />
+                                                                            </set>
+                                                                            <set>
+                                                                                <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-binding.src-access-node-id`" />
-                                                </set>
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                              resource="pnf"
-                                                              key="pnf.pnf-name = $tmp.domain.pnf-name"
-                                                              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.domain.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.domain.esr-thirdparty-id AND
-                    depth = '1'"
-                                                                                          pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                          resource="pnf"
+                                                                                          key="pnf.pnf-name = $tmp.domain.pnf-name"
+                                                                                          pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                <!--AND depth = '0'"-->
                                                                                 <outcome value='success'>
                                                                                     <block>
-                                                                                        <set>
-                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.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>
+                                                                                        <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.domain.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.domain.esr-thirdparty-id AND
+                    depth = '1'"
+                                                                                                                      pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                            <outcome value='success'>
+                                                                                                                <block>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.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>
+                                                                                                        <break/>
+                                                                                                    </block>
+                                                                                                </outcome>
+                                                                                            </switch>
+                                                                                        </for>
                                                                                     </block>
                                                                                 </outcome>
                                                                                 <outcome value='not-found'>
                                                                                     </return>
                                                                                 </outcome>
                                                                             </get-resource>
-                                                                            <break/>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="delete"/>
+                                                                                <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                <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=' + $prop.sdncRestApi.token_id`" />
+                                                                                <outcome value='success'>
+                                                                                    <block atomic="true"></block>
+                                                                                </outcome>
+                                                                                <outcome value='failure'>
+                                                                                    <return status='failure'>
+                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                        <parameter name="error-code" value="500" />
+                                                                                        <parameter name="error-message" value="Error executing delete OTN tunnel rest api" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                            </execute>
+                                                                            <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
                                                                         </block>
                                                                     </outcome>
+                                                                    <outcome value='false'></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>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
-                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
-                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
-                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
-                                                    <parameter name="format" value="json"/>
-                                                    <parameter name="httpMethod" value="delete"/>
-                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                    <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=' + $prop.sdncRestApi.token_id`" />
-                                                    <outcome value='failure'>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="Error executing delete OTN tunnel rest api" />
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='success'>
-                                                        <block atomic="true"></block>
-                                                    </outcome>
-                                                </execute>
-                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='false'></outcome>
-                                    </switch>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='error-code' value='' />
+                                                                <parameter name='error-message' value='' />
+                                                            </return>
+                                                        </outcome>
+                                                    </get-resource>
+                                                </block>
+                                            </outcome>
+                                        </switch>
+                                    </for>
                                 </block>
-                            </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.l3vpn.pe1_id`" />
-                        </return>
-                    </outcome>
-                    <outcome value='failure'>
-                        <return status='failure'>
-                            <parameter name='error-code' value='' />
-                            <parameter name='error-message' value='' />
-                        </return>
+                            </outcome>
+                        </get-resource>
                     </outcome>
-                </get-resource>
-            </block>
+                </switch>
+            </for>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
index 91889bb..dcc3d69 100644 (file)
                                                                                                                                                             <block atomic="true"></block>
                                                                                                                                                         </outcome>
                                                                                                                                                     </execute>
+                                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`" />
+                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                                                                                        <parameter name="format" value="json"/>
+                                                                                                                                                        <parameter name="httpMethod" value="delete"/>
+                                                                                                                                                        <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'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                <parameter name="error-message" value="Error executing delete ethernet service rest api" />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='success'>
+                                                                                                                                                            <block atomic="true"></block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </execute>
                                                                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' ></call>
                                                                                                                                                     <switch test="`$found-root-connectivity`">
                                                                                                                                                         <outcome value='true'>
                                                                                                                                                                                             </outcome>
                                                                                                                                                                                         </switch>
                                                                                                                                                                                     </for>
+                                                                                                                                                                                    <block atomic="true">
+                                                                                                                                                                                        <set>
+                                                                                                                                                                                            <parameter name='tmp.domain.pnf-name' 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.domain.pnf-name"
+                                                                                                                                                                                                      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.domain.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.domain.esr-thirdparty-id AND
+                    depth = '1'"
+                                                                                                                                                                                                                                  pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                                                                                        <outcome value='success'>
+                                                                                                                                                                                                                            <block>
+                                                                                                                                                                                                                                <set>
+                                                                                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.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>
+                                                                                                                                                                                                                    <break/>
+                                                                                                                                                                                                                </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>
+                                                                                                                                                                                        <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                                                                                                                                            <outcome value='Other'>
+                                                                                                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                                                                                                                    <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                                                                                                                                    <parameter name="format" value="json"/>
+                                                                                                                                                                                                    <parameter name="httpMethod" value="delete"/>
+                                                                                                                                                                                                    <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'>
+                                                                                                                                                                                                        <return status='failure'>
+                                                                                                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                                                                                                            <parameter name="error-message" value="Error executing delete ethernet service rest api" />
+                                                                                                                                                                                                        </return>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                    <outcome value='success'>
+                                                                                                                                                                                                        <block atomic="true"></block>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                </execute>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                            <outcome value=''></outcome>
+                                                                                                                                                                                        </switch>
+                                                                                                                                                                                    </block>
                                                                                                                                                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                                                                                             key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
                                                                                                                                                                                 </block>