Adding support for connecting a single ONU port to multiple clouds with different...

Also fixing a few bugs in cll creation and deletion.

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

Former-commit-id: af17de2185bc8e0d1a7f0cb6f965df157c893412

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
index 4ba32b4..1828f87 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,199 +1,199 @@
 [\r
     {\r
-        "id": "6467c9b6.3ea7b",\r
+        "id": "4a53e986.e1345",\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": 415.8833312988281,\r
-        "y": 377,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 401.8833312988281,\r
+        "y": 341,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "1c0c6fa0.017178",\r
-                "ec984d7b.605098",\r
-                "25450eba.0fd99a"\r
+                "bee28b81.87faf8",\r
+                "2e0d3206.b3958e",\r
+                "2caa6605.779652"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c0c6fa0.017178",\r
+        "id": "bee28b81.87faf8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 603.8833312988281,\r
-        "y": 390,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 589.8833312988281,\r
+        "y": 354,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "fcdf737f.3ba08"\r
+                "db2a2eb9.c4729"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec984d7b.605098",\r
+        "id": "2e0d3206.b3958e",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 611.374267578125,\r
-        "y": 432.57403564453125,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 597.374267578125,\r
+        "y": 396.57403564453125,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "25450eba.0fd99a",\r
+        "id": "2caa6605.779652",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 601.8833312988281,\r
-        "y": 479,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 587.8833312988281,\r
+        "y": 443,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "f645589d.ed3d98"\r
+                "9a0e1ef7.428b9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fcdf737f.3ba08",\r
+        "id": "db2a2eb9.c4729",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 776.8833312988281,\r
-        "y": 388,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 762.8833312988281,\r
+        "y": 352,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "6641b1bb.011df8"\r
+                "b1233538.ceab4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6641b1bb.011df8",\r
+        "id": "b1233538.ceab4",\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": 1005.8833312988281,\r
-        "y": 389,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 991.8833312988281,\r
+        "y": 353,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "42fd94e4.9f459c"\r
+                "f68da0c8.dc2638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42fd94e4.9f459c",\r
+        "id": "f68da0c8.dc2638",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1220.8833312988281,\r
-        "y": 390,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1206.8833312988281,\r
+        "y": 354,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "341f3db4.7e268a"\r
+                "947d4965.a799f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "802e937a.3ac",\r
+        "id": "ab775a4c.a509d",\r
         "type": "switchNode",\r
         "name": "switch vpnuuid is for this slice",\r
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1474.8833312988281,\r
-        "y": 312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1460.8833312988281,\r
+        "y": 276,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "ccfe4ade.41ae98",\r
-                "912c0faa.e5e1c8"\r
+                "1ae0d7f3.280b18",\r
+                "b7c135fb.7fc808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ccfe4ade.41ae98",\r
+        "id": "1ae0d7f3.280b18",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1691.8833312988281,\r
-        "y": 291,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1677.8833312988281,\r
+        "y": 255,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "341f3db4.7e268a"\r
+                "947d4965.a799f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "912c0faa.e5e1c8",\r
+        "id": "b7c135fb.7fc808",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1691.8833312988281,\r
-        "y": 340,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1677.8833312988281,\r
+        "y": 304,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "341f3db4.7e268a",\r
+        "id": "947d4965.a799f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1875.8833312988281,\r
-        "y": 377,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1861.8833312988281,\r
+        "y": 341,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "b1ca96f9.f78f38",\r
-                "2c3b3231.83c2be",\r
-                "4660bf61.473a18"\r
+                "7307d136.f98668",\r
+                "d6d93ab.df041c8",\r
+                "ed4d0298.cdb578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "377c3031.0fc7c",\r
+        "id": "d12da893.5808e",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 234.88333129882812,\r
-        "y": 118,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 220.88333129882812,\r
+        "y": 82,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "8b8ba227.5e7638"\r
+                "ba22940.68974f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b8ba227.5e7638",\r
+        "id": "ba22940.68974f",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -201,3545 +201,3545 @@
         "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": 519.1690216064453,\r
-        "y": 179.23810863494873,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 505.1690216064453,\r
+        "y": 143.23810863494873,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "6c55ded0.30c498"\r
+                "f0aeb23e.8f1f7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c55ded0.30c498",\r
+        "id": "f0aeb23e.8f1f7",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 525.3119354248047,\r
-        "y": 264.0000305175781,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 511.3119354248047,\r
+        "y": 228.00003051757812,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "b63c19cf.5911b8"\r
+                "849eab75.e48858"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b63c19cf.5911b8",\r
+        "id": "849eab75.e48858",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 835.1213684082031,\r
-        "y": 255.66668701171875,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 821.1213684082031,\r
+        "y": 219.66668701171875,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "6467c9b6.3ea7b",\r
-                "7714415.bcb45c",\r
-                "2cf2ff05.5ecb98",\r
-                "ff64d6f0.1d24e",\r
-                "c19ef147.be92d8"\r
+                "4a53e986.e1345",\r
+                "9dad0003.283738",\r
+                "47e937a3.3ee608",\r
+                "fa83bc41.1d8b08",\r
+                "39b1b2.d055464e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1ca96f9.f78f38",\r
+        "id": "7307d136.f98668",\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": 2092.883331298828,\r
-        "y": 315,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2078.883331298828,\r
+        "y": 279,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f11c1dac.45c748",\r
+        "id": "5be24b21.11ebc4",\r
         "type": "set",\r
         "name": "set attachment_param for OTN A",\r
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 4261.883331298828,\r
-        "y": 201,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4247.883331298828,\r
+        "y": 165,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c95c33ef.381fa8",\r
+        "id": "66c2f1fa.df4e",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4342.883331298828,\r
-        "y": 516,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4328.883331298828,\r
+        "y": 480,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "89c7efd5.cb6558",\r
-                "d5cfec9d.5347f8"\r
+                "78ae8a16.bcde6c",\r
+                "163e60b5.f624ef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89c7efd5.cb6558",\r
+        "id": "78ae8a16.bcde6c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4652.383331298828,\r
-        "y": 485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4638.383331298828,\r
+        "y": 449,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "beffe966.8b1b08"\r
+                "a86780cc.869ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5cfec9d.5347f8",\r
+        "id": "163e60b5.f624ef",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4657.383331298828,\r
-        "y": 550,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4643.383331298828,\r
+        "y": 514,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "18fce568.1c292b"\r
+                "496a02d9.361154"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "beffe966.8b1b08",\r
+        "id": "a86780cc.869ba",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 4828.383331298828,\r
-        "y": 485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4814.383331298828,\r
+        "y": 449,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "18fce568.1c292b",\r
+        "id": "496a02d9.361154",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4823.883331298828,\r
-        "y": 550,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4809.883331298828,\r
+        "y": 514,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "64fdffc9.427678",\r
+        "id": "4c8b1659.abc1b",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
         "comments": "",\r
-        "x": 4207.383331298828,\r
-        "y": 770,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4193.383331298828,\r
+        "y": 734,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c0e95206.343c2",\r
+        "id": "902cb9fb.0d496",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4361.383331298828,\r
-        "y": 818,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4347.383331298828,\r
+        "y": 782,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "7a1edf39.b6a0f8",\r
-                "b605ddae.9f2b2"\r
+                "f961065e.0e576",\r
+                "6ca1f611.56dee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a1edf39.b6a0f8",\r
+        "id": "f961065e.0e576",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4706.883331298828,\r
-        "y": 799,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4692.883331298828,\r
+        "y": 763,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "db29824f.2b664"\r
+                "6296fab8.967dac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b605ddae.9f2b2",\r
+        "id": "6ca1f611.56dee",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4710.883331298828,\r
-        "y": 839,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4696.883331298828,\r
+        "y": 803,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "10ebb808.22b9d8"\r
+                "ef7067c4.7ea328"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db29824f.2b664",\r
+        "id": "6296fab8.967dac",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 4864.883331298828,\r
-        "y": 799,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4850.883331298828,\r
+        "y": 763,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "10ebb808.22b9d8",\r
+        "id": "ef7067c4.7ea328",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4868.383331298828,\r
-        "y": 839,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4854.383331298828,\r
+        "y": 803,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "6d35eb39.2fe42c",\r
-                "b62c3c22.2cb09"\r
+                "ee477ca2.a65568",\r
+                "5e527e99.1f4728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d35eb39.2fe42c",\r
+        "id": "ee477ca2.a65568",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5198.883331298828,\r
-        "y": 804,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5184.883331298828,\r
+        "y": 768,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3f34bcf0.b30eb4",\r
+        "id": "f9d5afb7.0291b",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 5062.883331298828,\r
-        "y": 763,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5048.883331298828,\r
+        "y": 727,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b62c3c22.2cb09",\r
+        "id": "5e527e99.1f4728",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5125.883331298828,\r
-        "y": 850,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5111.883331298828,\r
+        "y": 814,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dc51dde.504a12",\r
+        "id": "48c30a65.f0f584",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 4199.883331298828,\r
-        "y": 249,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4185.883331298828,\r
+        "y": 213,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "25f0cbb9.ff400c",\r
+        "id": "bc523ecb.f956a8",\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": 4225.883331298828,\r
-        "y": 366,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4211.883331298828,\r
+        "y": 330,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "26af6a64.84f75e",\r
-                "dfaad5e6.3e7388",\r
-                "d4f19086.9e394"\r
+                "a72840b5.dc70e",\r
+                "54e4a8de.9445f8",\r
+                "4012660e.b55b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26af6a64.84f75e",\r
+        "id": "a72840b5.dc70e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4421.383453369141,\r
-        "y": 318,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4407.383453369141,\r
+        "y": 282,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "825f4729.b63ee8"\r
+                "9d071aa.9c29c68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dfaad5e6.3e7388",\r
+        "id": "54e4a8de.9445f8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4413.383453369141,\r
-        "y": 373,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4399.383453369141,\r
+        "y": 337,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "92b1984a.bc8b"\r
+                "3662c50c.d754d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "825f4729.b63ee8",\r
+        "id": "9d071aa.9c29c68",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4565.765777587891,\r
-        "y": 317.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4551.765777587891,\r
+        "y": 281.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "415768e6.6651f8"\r
+                "c1155c42.4dc2e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6a2d3e2.2e526",\r
+        "id": "a3b68f87.0c3248",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5147.883331298828,\r
-        "y": 320,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5133.883331298828,\r
+        "y": 284,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "e243a570.71b51"\r
+                "e6d1f56a.1147f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "415768e6.6651f8",\r
+        "id": "c1155c42.4dc2e8",\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": 4749.883331298828,\r
-        "y": 316,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4735.883331298828,\r
+        "y": 280,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "ab4dd1f4.04e1f"\r
+                "e3565ab9.0a825"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab4dd1f4.04e1f",\r
+        "id": "e3565ab9.0a825",\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": 4944.883331298828,\r
-        "y": 316,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4930.883331298828,\r
+        "y": 280,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "a6a2d3e2.2e526"\r
+                "a3b68f87.0c3248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4f19086.9e394",\r
+        "id": "4012660e.b55b2",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4418.383453369141,\r
-        "y": 430,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4404.383453369141,\r
+        "y": 394,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "28f88c03.cb5e5c"\r
+                "7e9c03d8.c41c7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28f88c03.cb5e5c",\r
+        "id": "7e9c03d8.c41c7c",\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": 4570.383453369141,\r
-        "y": 431,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4556.383453369141,\r
+        "y": 395,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "92b1984a.bc8b",\r
+        "id": "3662c50c.d754d2",\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": 4581.383453369141,\r
-        "y": 374,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4567.383453369141,\r
+        "y": 338,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "677439f1.5f7ed",\r
+        "id": "99fa8e6f.e803d8",\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": 5532.883331298828,\r
-        "y": 333,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5518.883331298828,\r
+        "y": 297,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "e7fd97d3.bbcd08",\r
-                "38bba5b7.de41b2",\r
-                "6bf961e8.c56a58"\r
+                "a38e0436.5aedc",\r
+                "80f6747e.265c78",\r
+                "c370b7ba.84a26"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e243a570.71b51",\r
+        "id": "e6d1f56a.1147f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5326.883331298828,\r
-        "y": 320,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5312.883331298828,\r
+        "y": 284,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "857cacb0.81444",\r
-                "677439f1.5f7ed"\r
+                "4599703a.c42f3",\r
+                "99fa8e6f.e803d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "857cacb0.81444",\r
+        "id": "4599703a.c42f3",\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": 5562.883331298828,\r
-        "y": 281,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5548.883331298828,\r
+        "y": 245,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e7fd97d3.bbcd08",\r
+        "id": "a38e0436.5aedc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5742.883331298828,\r
-        "y": 324,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5728.883331298828,\r
+        "y": 288,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "60a50433.d26434"\r
+                "8c88cbf0.e09b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38bba5b7.de41b2",\r
+        "id": "80f6747e.265c78",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5734.883331298828,\r
-        "y": 379,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5720.883331298828,\r
+        "y": 343,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "d9350787.861f1"\r
+                "e2be9acb.77d62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bf961e8.c56a58",\r
+        "id": "c370b7ba.84a26",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5739.883331298828,\r
-        "y": 436,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5725.883331298828,\r
+        "y": 400,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "1afc54ba.8ed313"\r
+                "856ee89c.2898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1afc54ba.8ed313",\r
+        "id": "856ee89c.2898",\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": 5891.883331298828,\r
-        "y": 437,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5877.883331298828,\r
+        "y": 401,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d9350787.861f1",\r
+        "id": "e2be9acb.77d62",\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": 5902.883331298828,\r
-        "y": 382,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5888.883331298828,\r
+        "y": 346,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "60a50433.d26434",\r
+        "id": "8c88cbf0.e09b1",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5887.265655517578,\r
-        "y": 321.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5873.265655517578,\r
+        "y": 285.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "8367dac2.ac8b98"\r
+                "a4a57efc.888ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8367dac2.ac8b98",\r
+        "id": "a4a57efc.888ff8",\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": 6101.883331298828,\r
-        "y": 318,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 6087.883331298828,\r
+        "y": 282,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aa2473a.12d4d9",\r
+        "id": "172d91c5.a78676",\r
         "type": "set",\r
         "name": "set attachment_param for OTN B",\r
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 3668.883331298828,\r
-        "y": 1658,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3654.883331298828,\r
+        "y": 1622,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "28a663c6.7433b4",\r
+        "id": "f13d198f.d5c79",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3731.883331298828,\r
-        "y": 1987,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3717.883331298828,\r
+        "y": 1951,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "422a3196.0fb7d",\r
-                "371e9e8f.f6f942"\r
+                "3640aede.8913a2",\r
+                "f1b1c8d.9945bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "422a3196.0fb7d",\r
+        "id": "3640aede.8913a2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4027.383331298828,\r
-        "y": 1954,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4013.383331298828,\r
+        "y": 1918,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c3084137.121c7"\r
+                "4b0d0deb.6577e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "371e9e8f.f6f942",\r
+        "id": "f1b1c8d.9945bb8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4032.383331298828,\r
-        "y": 2019,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4018.383331298828,\r
+        "y": 1983,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c6676165.ac5c"\r
+                "5da14040.cb50b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3084137.121c7",\r
+        "id": "4b0d0deb.6577e4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 4195.383331298828,\r
-        "y": 1954,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4181.383331298828,\r
+        "y": 1918,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c6676165.ac5c",\r
+        "id": "5da14040.cb50b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4205.883331298828,\r
-        "y": 2019,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4191.883331298828,\r
+        "y": 1983,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dfee532c.a1419",\r
+        "id": "1e50105a.a8b96",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 3607.883331298828,\r
-        "y": 1715,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3593.883331298828,\r
+        "y": 1679,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e52702af.314718",\r
+        "id": "dfe45c65.d48f6",\r
         "type": "get-resource",\r
         "name": "get-resource dst pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3627.883331298828,\r
-        "y": 1812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3613.883331298828,\r
+        "y": 1776,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "9ca1c561.5c796",\r
-                "9cf5cab4.99d6e",\r
-                "5d5762eb.724c64"\r
+                "56d2f84a.b524e8",\r
+                "43f5b436.ace8b4",\r
+                "a9c884c3.3b2c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ca1c561.5c796",\r
+        "id": "56d2f84a.b524e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3830.3834533691406,\r
-        "y": 1765,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3816.3834533691406,\r
+        "y": 1729,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "502f683e.00cf7"\r
+                "10cf7345.17615d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cf5cab4.99d6e",\r
+        "id": "43f5b436.ace8b4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3822.3834533691406,\r
-        "y": 1820,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3808.3834533691406,\r
+        "y": 1784,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "9587c00d.994eb"\r
+                "40e41e98.b2ab3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "502f683e.00cf7",\r
+        "id": "10cf7345.17615d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3974.7657775878906,\r
-        "y": 1762.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3960.7657775878906,\r
+        "y": 1726.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "39b96666.82062a"\r
+                "69889215.886b4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39b96666.82062a",\r
+        "id": "69889215.886b4c",\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": 4158.883331298828,\r
-        "y": 1777,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4144.883331298828,\r
+        "y": 1741,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "94ae9a5d.e5d56"\r
+                "3c1ff953.79a23e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d5762eb.724c64",\r
+        "id": "a9c884c3.3b2c18",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3827.3834533691406,\r
-        "y": 1877,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3813.3834533691406,\r
+        "y": 1841,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "7a00ac4a.8d918c"\r
+                "8ab7ecfb.f03ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a00ac4a.8d918c",\r
+        "id": "8ab7ecfb.f03ee",\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": 3979.3834533691406,\r
-        "y": 1878,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3965.3834533691406,\r
+        "y": 1842,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9587c00d.994eb",\r
+        "id": "40e41e98.b2ab3",\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": 3990.3834533691406,\r
-        "y": 1823,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3976.3834533691406,\r
+        "y": 1787,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1540d0.014217",\r
+        "id": "37ef2104.1e9d5e",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4556.883331298828,\r
-        "y": 1781,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4542.883331298828,\r
+        "y": 1745,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c932c6af.938f38"\r
+                "901dac81.52118"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94ae9a5d.e5d56",\r
+        "id": "3c1ff953.79a23e",\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": 4353.883331298828,\r
-        "y": 1777,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4339.883331298828,\r
+        "y": 1741,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "f1540d0.014217"\r
+                "37ef2104.1e9d5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ff151e7.182fee",\r
+        "id": "86b8c4cb.c3747",\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": 4941.883331298828,\r
-        "y": 1780,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4927.883331298828,\r
+        "y": 1744,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "40d3a7a.4400bd8",\r
-                "353377f9.20c718",\r
-                "f8f22501.0020d8"\r
+                "b5f45931.a1805",\r
+                "34bcb3b6.e69b1c",\r
+                "d4cc1381.862c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c932c6af.938f38",\r
+        "id": "901dac81.52118",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4733.883331298828,\r
-        "y": 1773,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4719.883331298828,\r
+        "y": 1737,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "53fc3a7e.05d404",\r
-                "2ff151e7.182fee"\r
+                "81cd4229.29ba8",\r
+                "86b8c4cb.c3747"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53fc3a7e.05d404",\r
+        "id": "81cd4229.29ba8",\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": 4971.883331298828,\r
-        "y": 1728,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4957.883331298828,\r
+        "y": 1692,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d551b07b.11f68",\r
+        "id": "a6f965e8.0bb248",\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": 5300.883331298828,\r
-        "y": 1884,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5286.883331298828,\r
+        "y": 1848,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c19bb319.e0e2b8",\r
+        "id": "3b503e2a.8c5dd2",\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": 5311.883331298828,\r
-        "y": 1829,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5297.883331298828,\r
+        "y": 1793,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2dbaf595.6cfed2",\r
+        "id": "a84f2510.1ebf08",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5296.265655517578,\r
-        "y": 1768.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5282.265655517578,\r
+        "y": 1732.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "eaeaf1b8.196fc"\r
+                "f83738f1.e5e14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eaeaf1b8.196fc",\r
+        "id": "f83738f1.e5e14",\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": 5510.883331298828,\r
-        "y": 1765,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5496.883331298828,\r
+        "y": 1729,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40d3a7a.4400bd8",\r
+        "id": "b5f45931.a1805",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5151.883331298828,\r
-        "y": 1771,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5137.883331298828,\r
+        "y": 1735,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "2dbaf595.6cfed2"\r
+                "a84f2510.1ebf08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "353377f9.20c718",\r
+        "id": "34bcb3b6.e69b1c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5143.883331298828,\r
-        "y": 1826,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5129.883331298828,\r
+        "y": 1790,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c19bb319.e0e2b8"\r
+                "3b503e2a.8c5dd2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f8f22501.0020d8",\r
+        "id": "d4cc1381.862c48",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5148.883331298828,\r
-        "y": 1883,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5134.883331298828,\r
+        "y": 1847,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "d551b07b.11f68"\r
+                "a6f965e8.0bb248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7d66e95.fb47e",\r
+        "id": "4a95df1.67c3fa",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has dst-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3182.883331298828,\r
-        "y": 729,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3168.883331298828,\r
+        "y": 693,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "4d8bbec2.c0db6",\r
-                "507d82bd.8807cc"\r
+                "60b8b463.e4925c",\r
+                "5e23be29.1eb6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d8bbec2.c0db6",\r
+        "id": "60b8b463.e4925c",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3396.883331298828,\r
-        "y": 766,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3382.883331298828,\r
+        "y": 730,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "6524452d.4a2f94"\r
+                "4d4203c4.4fd81c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "507d82bd.8807cc",\r
+        "id": "5e23be29.1eb6a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3398.883331298828,\r
-        "y": 704,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3384.883331298828,\r
+        "y": 668,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "4b590d33.c81684"\r
+                "402d5674.bb5698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6524452d.4a2f94",\r
+        "id": "4d4203c4.4fd81c",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2976.883331298828,\r
-        "y": 2009,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2962.883331298828,\r
+        "y": 1973,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "75800cfe.e64b04",\r
-                "28895848.af5c18"\r
+                "4155de88.54a1f",\r
+                "11e38b5d.85c715"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75800cfe.e64b04",\r
+        "id": "4155de88.54a1f",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3229.883331298828,\r
-        "y": 2043,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3215.883331298828,\r
+        "y": 2007,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "34389e65.7f3f0a"\r
+                "97b4f973.8f85a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28895848.af5c18",\r
+        "id": "11e38b5d.85c715",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3229.883331298828,\r
-        "y": 1987,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3215.883331298828,\r
+        "y": 1951,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "4c94a377.c6d4e4"\r
+                "4bdf7725.9cef3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34389e65.7f3f0a",\r
+        "id": "97b4f973.8f85a8",\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": 3380.883331298828,\r
-        "y": 2043,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3366.883331298828,\r
+        "y": 2007,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff717106.1f6f7",\r
+        "id": "15e2350c.3f989b",\r
         "type": "set",\r
         "name": "set vpn-bindingA and connectivityA",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
         "comments": "",\r
-        "x": 4256.883331298828,\r
-        "y": 141,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4242.883331298828,\r
+        "y": 105,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98bc8f5e.55646",\r
+        "id": "22f55219.d9af6e",\r
         "type": "set",\r
         "name": "set vpn-bindingB and connectivityB",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
         "comments": "",\r
-        "x": 3664.883331298828,\r
-        "y": 1600,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3650.883331298828,\r
+        "y": 1564,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1901ad68.6869bb",\r
+        "id": "9157e39e.50973",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3947.883331298828,\r
-        "y": 398,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3933.883331298828,\r
+        "y": 362,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "ff717106.1f6f7",\r
-                "f11c1dac.45c748",\r
-                "dc51dde.504a12",\r
-                "25f0cbb9.ff400c",\r
-                "c95c33ef.381fa8",\r
-                "7a0ef184.deb28",\r
-                "dd4c3392.e1b02",\r
-                "2a6ffb7c.8797f4"\r
+                "15e2350c.3f989b",\r
+                "5be24b21.11ebc4",\r
+                "48c30a65.f0f584",\r
+                "bc523ecb.f956a8",\r
+                "66c2f1fa.df4e",\r
+                "738a4fa7.5a68d",\r
+                "9521e4ca.a61af",\r
+                "224f4283.917d26"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c94a377.c6d4e4",\r
+        "id": "4bdf7725.9cef3",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3380.883331298828,\r
-        "y": 1986,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3366.883331298828,\r
+        "y": 1950,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "98bc8f5e.55646",\r
-                "aa2473a.12d4d9",\r
-                "dfee532c.a1419",\r
-                "e52702af.314718",\r
-                "28a663c6.7433b4",\r
-                "c984548c.2e537",\r
-                "88e8f378.a2b808",\r
-                "1fda4b4a.2131e5"\r
+                "22f55219.d9af6e",\r
+                "172d91c5.a78676",\r
+                "1e50105a.a8b96",\r
+                "dfe45c65.d48f6",\r
+                "f13d198f.d5c79",\r
+                "78f084cb.41e754",\r
+                "e35a6c95.6b3d6",\r
+                "1ced8517.ce35e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d79079df.baf578",\r
+        "id": "e7e7eca7.931088",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
         "comments": "",\r
-        "x": 3618.883331298828,\r
-        "y": 2285,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3604.883331298828,\r
+        "y": 2249,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45ccc628.f5551",\r
+        "id": "5544b67f.df3238",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3772.883331298828,\r
-        "y": 2333,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3758.883331298828,\r
+        "y": 2297,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "6173b4db.203ce4",\r
-                "7f21396.e7ee248"\r
+                "b36c5e4.a4b982",\r
+                "75e03418.7b0a3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6173b4db.203ce4",\r
+        "id": "b36c5e4.a4b982",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4118.383331298828,\r
-        "y": 2314,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4104.383331298828,\r
+        "y": 2278,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "2b5ddf83.e8a168"\r
+                "996a2de3.86ff68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f21396.e7ee248",\r
+        "id": "75e03418.7b0a3c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4122.383331298828,\r
-        "y": 2354,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4108.383331298828,\r
+        "y": 2318,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "9fc151.f9cc46b"\r
+                "1787d971.8d0d67"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b5ddf83.e8a168",\r
+        "id": "996a2de3.86ff68",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 4276.383331298828,\r
-        "y": 2314,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4262.383331298828,\r
+        "y": 2278,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9fc151.f9cc46b",\r
+        "id": "1787d971.8d0d67",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4279.883331298828,\r
-        "y": 2354,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4265.883331298828,\r
+        "y": 2318,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "ec406c4.a093b1",\r
-                "ba32c60f.0ec53"\r
+                "79bbcc28.d4fd3c",\r
+                "137b8fb9.4aaa78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec406c4.a093b1",\r
+        "id": "79bbcc28.d4fd3c",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4619.883331298828,\r
-        "y": 2353,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4605.883331298828,\r
+        "y": 2317,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "650aeaf3.da502c",\r
+        "id": "9aab71de.3f671",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 4477.883331298828,\r
-        "y": 2311,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4463.883331298828,\r
+        "y": 2275,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba32c60f.0ec53",\r
+        "id": "137b8fb9.4aaa78",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4548.883331298828,\r
-        "y": 2402,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4534.883331298828,\r
+        "y": 2366,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c8295377.ff6158",\r
+        "id": "e7a16254.b52678",\r
         "type": "set",\r
         "name": "set attachment_param (gfp-n) for OTN",\r
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
         "comments": "",\r
-        "x": 3173.883331298828,\r
-        "y": 669,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3159.883331298828,\r
+        "y": 633,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "17d3b71c.0a74f9",\r
+        "id": "b98d7c04.aadb6",\r
         "type": "comment",\r
         "name": "only dst ttp exists. No src",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3768.883331298828,\r
-        "y": 355,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3754.883331298828,\r
+        "y": 319,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12dd212a.e5931f",\r
+        "id": "f9466402.70d608",\r
         "type": "comment",\r
         "name": "only src ttp exists. No dst",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3325.883331298828,\r
-        "y": 1933,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3311.883331298828,\r
+        "y": 1897,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4b590d33.c81684",\r
+        "id": "402d5674.bb5698",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3504.883331298828,\r
-        "y": 517,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3490.883331298828,\r
+        "y": 481,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "e68f7957.57ea98",\r
-                "90c8120e.55a8c8"\r
+                "40174504.12275c",\r
+                "483f6800.997ef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90c8120e.55a8c8",\r
+        "id": "483f6800.997ef8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3746.883331298828,\r
-        "y": 1106,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3732.883331298828,\r
+        "y": 1070,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "5f92c041.e2a22"\r
+                "f91cd9b2.b4ebc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e68f7957.57ea98",\r
+        "id": "40174504.12275c",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3740.883331298828,\r
-        "y": 397,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3726.883331298828,\r
+        "y": 361,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "1901ad68.6869bb"\r
+                "9157e39e.50973"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f92c041.e2a22",\r
+        "id": "f91cd9b2.b4ebc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3904.883331298828,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3890.883331298828,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "eb5cd95b.b46698",\r
-                "bcb9498.a9205b8",\r
-                "24e13fd8.afe2d8",\r
-                "57e5431f.63be4c",\r
-                "8b688219.8ed198",\r
-                "9c0b0957.1e6c48"\r
+                "e0a89dfb.b97bd8",\r
+                "356efc92.1be0c4",\r
+                "b98c51bd.b1df7",\r
+                "c9386596.fb5188",\r
+                "99a335d9.47dc9",\r
+                "1d1e23b2.17cb04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcb9498.a9205b8",\r
+        "id": "356efc92.1be0c4",\r
         "type": "set",\r
         "name": "set attachment_param for OTN G",\r
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 4168.883331298828,\r
-        "y": 988,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4154.883331298828,\r
+        "y": 952,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b688219.8ed198",\r
+        "id": "99a335d9.47dc9",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4249.883331298828,\r
-        "y": 1303,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4235.883331298828,\r
+        "y": 1267,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "4ea88210.ceec44",\r
-                "cd5b1128.4dbb9"\r
+                "2ae3d84f.15cb3",\r
+                "a0cd8374.ae65d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ea88210.ceec44",\r
+        "id": "2ae3d84f.15cb3",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4559.383331298828,\r
-        "y": 1272,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4545.383331298828,\r
+        "y": 1236,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "9646de5b.fe3c7"\r
+                "d03fdf1c.3b45d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd5b1128.4dbb9",\r
+        "id": "a0cd8374.ae65d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4564.383331298828,\r
-        "y": 1337,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4550.383331298828,\r
+        "y": 1301,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "55735b11.27f424"\r
+                "f8c3fa12.5c834"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9646de5b.fe3c7",\r
+        "id": "d03fdf1c.3b45d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 4735.383331298828,\r
-        "y": 1272,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4721.383331298828,\r
+        "y": 1236,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "55735b11.27f424",\r
+        "id": "f8c3fa12.5c834",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4730.883331298828,\r
-        "y": 1337,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4716.883331298828,\r
+        "y": 1301,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "24e13fd8.afe2d8",\r
+        "id": "b98c51bd.b1df7",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 4106.883331298828,\r
-        "y": 1036,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4092.883331298828,\r
+        "y": 1000,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "57e5431f.63be4c",\r
+        "id": "c9386596.fb5188",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4132.883331298828,\r
-        "y": 1153,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4118.883331298828,\r
+        "y": 1117,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "1d187a80.e65b15",\r
-                "370c15e3.9b5fca",\r
-                "703dc49a.960884"\r
+                "312e9154.f9dbd6",\r
+                "38e6d39b.3fc964",\r
+                "d52b1c1f.8a6ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d187a80.e65b15",\r
+        "id": "312e9154.f9dbd6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4328.383453369141,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4314.383453369141,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "5c6509dd.e3a81"\r
+                "6d3eafaf.02fb48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "370c15e3.9b5fca",\r
+        "id": "38e6d39b.3fc964",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4320.383453369141,\r
-        "y": 1160,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4306.383453369141,\r
+        "y": 1124,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "ccfe239.f2e7de"\r
+                "3519bfd5.fa4b3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c6509dd.e3a81",\r
+        "id": "6d3eafaf.02fb48",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4472.765777587891,\r
-        "y": 1104.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4458.765777587891,\r
+        "y": 1068.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "35d4ca24.cf236e"\r
+                "6a66b1f9.955598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "35d4ca24.cf236e",\r
+        "id": "6a66b1f9.955598",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4656.883331298828,\r
-        "y": 1103,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4642.883331298828,\r
+        "y": 1067,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c8705d75.001f7"\r
+                "43b05855.517cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8705d75.001f7",\r
+        "id": "43b05855.517cf",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4851.883331298828,\r
-        "y": 1103,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4837.883331298828,\r
+        "y": 1067,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "b9376422.2a71"\r
+                "c21a24cd.dd2528"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "703dc49a.960884",\r
+        "id": "d52b1c1f.8a6ca8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4325.383453369141,\r
-        "y": 1217,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4311.383453369141,\r
+        "y": 1181,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "ece92d94.dd0ac"\r
+                "db81dd24.8006b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ece92d94.dd0ac",\r
+        "id": "db81dd24.8006b",\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": 4477.383453369141,\r
-        "y": 1218,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4463.383453369141,\r
+        "y": 1182,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ccfe239.f2e7de",\r
+        "id": "3519bfd5.fa4b3",\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": 4488.383453369141,\r
-        "y": 1161,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4474.383453369141,\r
+        "y": 1125,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb5cd95b.b46698",\r
+        "id": "e0a89dfb.b97bd8",\r
         "type": "set",\r
         "name": "set vpn-bindingG and connectivityG",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
         "comments": "",\r
-        "x": 4163.883331298828,\r
-        "y": 928,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4149.883331298828,\r
+        "y": 892,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9376422.2a71",\r
+        "id": "c21a24cd.dd2528",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5054.883331298828,\r
-        "y": 1107,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5040.883331298828,\r
+        "y": 1071,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "d2480516.2fc378"\r
+                "f7c609f5.0c2d28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cb817ae.cef538",\r
+        "id": "dff3e5ec.9273",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5439.883331298828,\r
-        "y": 1120,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5425.883331298828,\r
+        "y": 1084,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "a79825bb.dff1f8",\r
-                "1395d5f.298062a",\r
-                "7903ca2c.aa5cc4"\r
+                "2769bc77.6b9fa4",\r
+                "7925966f.3df658",\r
+                "161a4207.178c96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2480516.2fc378",\r
+        "id": "f7c609f5.0c2d28",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5233.883331298828,\r
-        "y": 1107,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5219.883331298828,\r
+        "y": 1071,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "fbf9e6b6.15b5c",\r
-                "9cb817ae.cef538"\r
+                "3634d6f2.f94292",\r
+                "dff3e5ec.9273"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fbf9e6b6.15b5c",\r
+        "id": "3634d6f2.f94292",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainG id",\r
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 5469.883331298828,\r
-        "y": 1068,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5455.883331298828,\r
+        "y": 1032,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a79825bb.dff1f8",\r
+        "id": "2769bc77.6b9fa4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5649.883331298828,\r
-        "y": 1111,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5635.883331298828,\r
+        "y": 1075,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c7dce557.6dded"\r
+                "8b0e2b2b.7a21d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1395d5f.298062a",\r
+        "id": "7925966f.3df658",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5641.883331298828,\r
-        "y": 1166,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5627.883331298828,\r
+        "y": 1130,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "598e647b.5837b4"\r
+                "b9107d6e.7c0358"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7903ca2c.aa5cc4",\r
+        "id": "161a4207.178c96",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5646.883331298828,\r
-        "y": 1223,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5632.883331298828,\r
+        "y": 1187,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "e6c7a6e7.b2f038"\r
+                "d5598bab.3dfb58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6c7a6e7.b2f038",\r
+        "id": "d5598bab.3dfb58",\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": 5798.883331298828,\r
-        "y": 1224,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5784.883331298828,\r
+        "y": 1188,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "598e647b.5837b4",\r
+        "id": "b9107d6e.7c0358",\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": 5809.883331298828,\r
-        "y": 1169,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5795.883331298828,\r
+        "y": 1133,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c7dce557.6dded",\r
+        "id": "8b0e2b2b.7a21d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5794.265655517578,\r
-        "y": 1108.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5780.265655517578,\r
+        "y": 1072.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "2cfbc0b6.6ae748"\r
+                "f80d31a9.31f3d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cfbc0b6.6ae748",\r
+        "id": "f80d31a9.31f3d",\r
         "type": "set",\r
         "name": "set controller domainG data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 6008.883331298828,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5994.883331298828,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fca9cd7.3028eb",\r
+        "id": "d718b282.287ca",\r
         "type": "comment",\r
         "name": "both src and dst exist",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3782.883331298828,\r
-        "y": 1046,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3768.883331298828,\r
+        "y": 1010,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c3b3231.83c2be",\r
+        "id": "d6d93ab.df041c8",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2344.883331298828,\r
-        "y": 773,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2330.883331298828,\r
+        "y": 737,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "81a947d8.a13a68",\r
-                "b480f4ae.d59fb8"\r
+                "7d753f63.af1d7",\r
+                "7719dbd9.957fc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b480f4ae.d59fb8",\r
+        "id": "7719dbd9.957fc4",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2751.883331298828,\r
-        "y": 791,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2737.883331298828,\r
+        "y": 755,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "23d2aee5.d5b2fa"\r
+                "2b5dce30.392f92"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81a947d8.a13a68",\r
+        "id": "7d753f63.af1d7",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2751.883331298828,\r
-        "y": 736,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2737.883331298828,\r
+        "y": 700,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "773948cf.a686e8"\r
+                "155f7f13.57fce1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "773948cf.a686e8",\r
+        "id": "155f7f13.57fce1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2907.883331298828,\r
-        "y": 734,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2893.883331298828,\r
+        "y": 698,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c8295377.ff6158",\r
-                "c7d66e95.fb47e"\r
+                "e7a16254.b52678",\r
+                "4a95df1.67c3fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23d2aee5.d5b2fa",\r
+        "id": "2b5dce30.392f92",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2884.883331298828,\r
-        "y": 792,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2870.883331298828,\r
+        "y": 756,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7714415.bcb45c",\r
+        "id": "9dad0003.283738",\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": 1061.8833312988281,\r
-        "y": 208,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1047.8833312988281,\r
+        "y": 172,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "79981366.647454",\r
+        "id": "a6d3cb9.27687b8",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
         "comments": "",\r
-        "x": 4178.883331298828,\r
-        "y": 626,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4164.883331298828,\r
+        "y": 590,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a0ef184.deb28",\r
+        "id": "738a4fa7.5a68d",\r
         "type": "set",\r
         "name": "set leaf-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 4238.883331298828,\r
-        "y": 665,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4224.883331298828,\r
+        "y": 629,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2cf2ff05.5ecb98",\r
+        "id": "47e937a3.3ee608",\r
         "type": "set",\r
         "name": "unset leaf-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",\r
         "comments": "",\r
-        "x": 1054.8833312988281,\r
-        "y": 116,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1040.8833312988281,\r
+        "y": 80,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7871357e.92d2f4",\r
+        "id": "6f67cdff.5c5554",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
         "comments": "",\r
-        "x": 3590.883331298828,\r
-        "y": 2142,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3576.883331298828,\r
+        "y": 2106,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c984548c.2e537",\r
+        "id": "78f084cb.41e754",\r
         "type": "set",\r
         "name": "set root-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 3646.883331298828,\r
-        "y": 2191,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3632.883331298828,\r
+        "y": 2155,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "efee660.b5b7f18",\r
+        "id": "912dde6.9b60fa",\r
         "type": "set",\r
         "name": "unset root-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",\r
         "comments": "",\r
-        "x": 1054.8833312988281,\r
-        "y": 155,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1040.8833312988281,\r
+        "y": 119,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff64d6f0.1d24e",\r
+        "id": "fa83bc41.1d8b08",\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": 1085.8833312988281,\r
-        "y": 256,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1071.8833312988281,\r
+        "y": 220,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c19ef147.be92d8",\r
+        "id": "39b1b2.d055464e",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 295.8833312988281,\r
-        "y": 731,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 281.8833312988281,\r
+        "y": 695,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "4acbe821.0c1ff8",\r
-                "63a107d4.a006c8",\r
-                "4bb92513.9b1ebc"\r
+                "e70c3582.89ad08",\r
+                "3aeaa08a.574a",\r
+                "1322af3c.bc6319"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4acbe821.0c1ff8",\r
+        "id": "e70c3582.89ad08",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 514.8833312988281,\r
-        "y": 669,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 500.8833312988281,\r
+        "y": 633,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "d6a121aa.ecf888"\r
+                "9c476365.2b909"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63a107d4.a006c8",\r
+        "id": "3aeaa08a.574a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 524.3742980957031,\r
-        "y": 711.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 510.3742980957031,\r
+        "y": 675.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4bb92513.9b1ebc",\r
+        "id": "1322af3c.bc6319",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 512.8833312988281,\r
-        "y": 758,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 498.8833312988281,\r
+        "y": 722,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "f58f94a6.d7fb9"\r
+                "23db95da.1941e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6a121aa.ecf888",\r
+        "id": "9c476365.2b909",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 711.8833312988281,\r
-        "y": 665,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 697.8833312988281,\r
+        "y": 629,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "46606d75.f5af5c"\r
+                "1a5a20de.60b4cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f58f94a6.d7fb9",\r
+        "id": "23db95da.1941e2",\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": 681.8833312988281,\r
-        "y": 759,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 667.8833312988281,\r
+        "y": 723,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46606d75.f5af5c",\r
+        "id": "1a5a20de.60b4cf",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 935.2168273925781,\r
-        "y": 664.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 921.2168273925781,\r
+        "y": 628.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "1dffeedd.2e39d1"\r
+                "59a859e2.c48ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1dffeedd.2e39d1",\r
+        "id": "59a859e2.c48ca8",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1135.8834648132324,\r
-        "y": 666.000020980835,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1121.8834648132324,\r
+        "y": 630.000020980835,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "5eeac4ab.784bec"\r
+                "ae28be96.a81b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5eeac4ab.784bec",\r
+        "id": "ae28be96.a81b18",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 265.8833312988281,\r
-        "y": 928,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 251.88333129882812,\r
+        "y": 892,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "93ffca07.c36c6",\r
-                "a6155e5c.4a2e4",\r
-                "edf3ae2.0898ad"\r
+                "4595d435.587aa4",\r
+                "60a8c3ff.237aec",\r
+                "18e77ed.3460901"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93ffca07.c36c6",\r
+        "id": "4595d435.587aa4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 473.8833312988281,\r
-        "y": 892,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 459.8833312988281,\r
+        "y": 856,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "41f16b19.4ea28c"\r
+                "9c5806bb.83c05"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6155e5c.4a2e4",\r
+        "id": "60a8c3ff.237aec",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 474.3742980957031,\r
-        "y": 937.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 460.3742980957031,\r
+        "y": 901.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "edf3ae2.0898ad",\r
+        "id": "18e77ed.3460901",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 471.8833312988281,\r
-        "y": 981,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 457.8833312988281,\r
+        "y": 945,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "77488207.b4a2f4"\r
+                "a170b783.101ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77488207.b4a2f4",\r
+        "id": "a170b783.101ed",\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": 640.8833312988281,\r
-        "y": 982,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 626.8833312988281,\r
+        "y": 946,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1853bc71.11bc54",\r
+        "id": "aaf101ae.84a298",\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": 612.8833312988281,\r
-        "y": 1476,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 598.8833312988281,\r
+        "y": 1440,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "aa99b60e.a0ae8"\r
+                "48f75925.f13078"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa99b60e.a0ae8",\r
+        "id": "48f75925.f13078",\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": 815.8833312988281,\r
-        "y": 1488,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 801.8833312988281,\r
+        "y": 1452,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "6b5b67d6.d9cff8"\r
+                "dc596581.8a224"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b5b67d6.d9cff8",\r
+        "id": "dc596581.8a224",\r
         "type": "outcome",\r
         "name": "UNI",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 981.8833312988281,\r
-        "y": 1485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 967.8833312988281,\r
+        "y": 1449,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c9be5883.2f43"\r
+                "63611a55.44e3fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9be5883.2f43",\r
+        "id": "63611a55.44e3fc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1142.8833312988281,\r
-        "y": 1482,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1128.8833312988281,\r
+        "y": 1446,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "8328946b.83ccf",\r
-                "70436354.fbd2a4",\r
-                "71db6bb7.f92dd4",\r
-                "a3af61e2.8efbd8",\r
-                "1dbcecbe.b5c9a3"\r
+                "155181d9.def56e",\r
+                "450c0202.9562fc",\r
+                "e522d7e8.f0b6d",\r
+                "b85bac18.623698",\r
+                "d97c4e37.51bad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70436354.fbd2a4",\r
+        "id": "450c0202.9562fc",\r
         "type": "set",\r
         "name": "unset tmp.aai.uni",\r
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
         "comments": "",\r
-        "x": 1346.8833312988281,\r
-        "y": 1440,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1332.8833312988281,\r
+        "y": 1404,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8328946b.83ccf",\r
+        "id": "155181d9.def56e",\r
         "type": "save",\r
         "name": "get uni from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1343.8833312988281,\r
-        "y": 1485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1329.8833312988281,\r
+        "y": 1449,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "95cc35e2.dbd57",\r
-                "6243e8b2.6e7d68",\r
-                "ea238384.cd0de8"\r
+                "c73d859f.d40f2",\r
+                "cdecbb41.644898",\r
+                "ca040aae.e9fa08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6243e8b2.6e7d68",\r
+        "id": "cdecbb41.644898",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1539.3742980957031,\r
-        "y": 1458.573974609375,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1525.3742980957031,\r
+        "y": 1422.573974609375,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "60cc7ad4.175214"\r
+                "dcd0fdd9.1c84f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea238384.cd0de8",\r
+        "id": "ca040aae.e9fa08",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1534.8833312988281,\r
-        "y": 1502.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1520.8833312988281,\r
+        "y": 1466.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "33a586e8.574ea2"\r
+                "7c23dd25.00653c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60cc7ad4.175214",\r
+        "id": "dcd0fdd9.1c84f",\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": 1701.9458312988281,\r
-        "y": 1457.8596801757812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1687.9458312988281,\r
+        "y": 1421.8596801757812,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "33a586e8.574ea2",\r
+        "id": "7c23dd25.00653c",\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": 1702.8833312988281,\r
-        "y": 1502.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1688.8833312988281,\r
+        "y": 1466.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ed2826e.143bbe",\r
+        "id": "c84187cf.6e6008",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1704.8833312988281,\r
-        "y": 1549.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1690.8833312988281,\r
+        "y": 1513.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "95cc35e2.dbd57",\r
+        "id": "c73d859f.d40f2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1535.8833312988281,\r
-        "y": 1549.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1521.8833312988281,\r
+        "y": 1513.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "3ed2826e.143bbe"\r
+                "c84187cf.6e6008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3b35ff6.7d4a88",\r
+        "id": "a7f36b9f.f75b88",\r
         "type": "switchNode",\r
         "name": "switch conn type",\r
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 225.38333129882812,\r
-        "y": 1147,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 211.38333129882812,\r
+        "y": 1111,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "53e42336.cf6874",\r
-                "64e5ac9.b8c59d4",\r
-                "29d673d9.3ef8bc"\r
+                "b58d5b5e.9a197",\r
+                "5c723a86.22c16c",\r
+                "fb40210e.8c5be8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fdb5b362.28d2e8",\r
+        "id": "ce504b34.d68ac8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 336.3833312988281,\r
-        "y": 1503,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 322.3833312988281,\r
+        "y": 1467,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "53e42336.cf6874",\r
+        "id": "b58d5b5e.9a197",\r
         "type": "outcome",\r
         "name": "leaf",\r
         "xml": "<outcome value='leaf'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 211.38333129882812,\r
-        "y": 1393,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 197.38333129882812,\r
+        "y": 1357,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "2d911faf.b625f"\r
+                "67ff853e.386644"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64e5ac9.b8c59d4",\r
+        "id": "5c723a86.22c16c",\r
         "type": "outcome",\r
         "name": "root",\r
         "xml": "<outcome value='root'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 212.38333129882812,\r
-        "y": 1451,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 198.38333129882812,\r
+        "y": 1415,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c8a49fba.48732"\r
+                "402699af.4c591"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29d673d9.3ef8bc",\r
+        "id": "fb40210e.8c5be8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 214.38333129882812,\r
-        "y": 1505,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 200.38333129882812,\r
+        "y": 1469,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "fdb5b362.28d2e8"\r
+                "ce504b34.d68ac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "893647bf.8d35f8",\r
+        "id": "5d006f15.710a08",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
         "comments": "",\r
-        "x": 1319.8833312988281,\r
-        "y": 1713,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1305.8833312988281,\r
+        "y": 1677,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "71db6bb7.f92dd4",\r
+        "id": "e522d7e8.f0b6d",\r
         "type": "set",\r
         "name": "set ethernet-srv-end-points-list array",\r
         "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1410.8833312988281,\r
-        "y": 1767,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1396.8833312988281,\r
+        "y": 1731,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8a49fba.48732",\r
+        "id": "402699af.4c591",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 328.3833312988281,\r
-        "y": 1447,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 314.3833312988281,\r
+        "y": 1411,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c9ed31d4.2a59a",\r
-                "1853bc71.11bc54",\r
-                "e2c4a442.f42cf",\r
-                "7b94a56a.0cc0c4",\r
-                "14d69ea3.c37079",\r
-                "e39ba7bd.aed5d8",\r
-                "9e9fd2d9.fce4a8",\r
-                "3e44ba6b.3875e6",\r
-                "de368aef.16cb",\r
-                "61a182f0.95ec2c",\r
-                "fae7aeca.a940b8",\r
-                "f92bafd0.7c69c8"\r
+                "784b1e5c.92c77",\r
+                "aaf101ae.84a298",\r
+                "dfffb0d0.b2d2d",\r
+                "3502903c.982ab",\r
+                "5524ecac.5cf47c",\r
+                "a12bd239.f8368",\r
+                "f8f2651c.3a035",\r
+                "f84d6f72.692148",\r
+                "5d1396ed.19b6f8",\r
+                "1b4871a6.1cd8a6",\r
+                "48083140.e99758",\r
+                "d94511cd.5d63f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d911faf.b625f",\r
+        "id": "67ff853e.386644",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 341.3833312988281,\r
-        "y": 1389,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 326.3833312988281,\r
+        "y": 1348,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "1853bc71.11bc54",\r
-                "30a75a3e.13e116",\r
-                "878444f9.a47b7",\r
-                "7b94a56a.0cc0c4",\r
-                "14d69ea3.c37079",\r
-                "e39ba7bd.aed5d8",\r
-                "9e9fd2d9.fce4a8",\r
-                "3e44ba6b.3875e6",\r
-                "de368aef.16cb",\r
-                "61a182f0.95ec2c",\r
-                "fae7aeca.a940b8",\r
-                "f92bafd0.7c69c8"\r
+                "aaf101ae.84a298",\r
+                "80e8f9a6.45b808",\r
+                "70ed09af.22122",\r
+                "3502903c.982ab",\r
+                "5524ecac.5cf47c",\r
+                "a12bd239.f8368",\r
+                "f8f2651c.3a035",\r
+                "f84d6f72.692148",\r
+                "5d1396ed.19b6f8",\r
+                "1b4871a6.1cd8a6",\r
+                "48083140.e99758",\r
+                "d94511cd.5d63f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30a75a3e.13e116",\r
+        "id": "80e8f9a6.45b808",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
         "comments": "",\r
-        "x": 632.3833312988281,\r
-        "y": 1269,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 618.3833312988281,\r
+        "y": 1233,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9ed31d4.2a59a",\r
+        "id": "784b1e5c.92c77",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
         "comments": "",\r
-        "x": 649.3833312988281,\r
-        "y": 1363,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 635.3833312988281,\r
+        "y": 1327,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7b94a56a.0cc0c4",\r
+        "id": "3502903c.982ab",\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": 575.8833312988281,\r
-        "y": 1732,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 561.8833312988281,\r
+        "y": 1696,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "bd67d795.2e839"\r
+                "2dc7d020.0f01c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd67d795.2e839",\r
+        "id": "2dc7d020.0f01c8",\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": 807.8833312988281,\r
-        "y": 1731,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 793.8833312988281,\r
+        "y": 1695,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "148b77ab.48b7a"\r
+                "9a9b2fc1.cfc378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "148b77ab.48b7a",\r
+        "id": "9a9b2fc1.cfc378",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1019.8833312988281,\r
-        "y": 1732,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1005.8833312988281,\r
+        "y": 1696,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "90ccd6ae.a26198"\r
+                "3ee84e3e.71c9c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90ccd6ae.a26198",\r
+        "id": "3ee84e3e.71c9c2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 275.8833312988281,\r
-        "y": 1888,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 261.8833312988281,\r
+        "y": 1852,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "8f4c1c14.35a72",\r
-                "c6a7aee9.6724"\r
+                "a6f3ac42.8fbf28",\r
+                "c5253df7.0ed11"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6a7aee9.6724",\r
+        "id": "c5253df7.0ed11",\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": 510.8833312988281,\r
-        "y": 1875,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 496.8833312988281,\r
+        "y": 1839,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f4c1c14.35a72",\r
+        "id": "a6f3ac42.8fbf28",\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": 500.8833312988281,\r
-        "y": 1936,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 486.8833312988281,\r
+        "y": 1900,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "2e648939.1db066",\r
-                "6fc34533.3f02e4",\r
-                "f4ca0a98.2172d"\r
+                "b27c66fe.f461f8",\r
+                "d86a808d.b5d38",\r
+                "51be47ba.06369"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6fc34533.3f02e4",\r
+        "id": "d86a808d.b5d38",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 714.3742980957031,\r
-        "y": 1920.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 700.3742980957031,\r
+        "y": 1884.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "24a8c225.12e4ae"\r
+                "40ccd27e.7bf8ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4ca0a98.2172d",\r
+        "id": "51be47ba.06369",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 709.8833312988281,\r
-        "y": 1965,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 695.8833312988281,\r
+        "y": 1929,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "a2a9b29c.7bdb18"\r
+                "10ad75eb.cd3092"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e648939.1db066",\r
+        "id": "b27c66fe.f461f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 711.8833312988281,\r
-        "y": 2025,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 697.8833312988281,\r
+        "y": 1989,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "6e035263.0ab9c4"\r
+                "f72f31f7.42e17"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24a8c225.12e4ae",\r
+        "id": "40ccd27e.7bf8ec",\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": 876.9458312988281,\r
-        "y": 1919.8597412109375,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 862.9458312988281,\r
+        "y": 1883.8597412109375,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a2a9b29c.7bdb18",\r
+        "id": "10ad75eb.cd3092",\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": 877.8833312988281,\r
-        "y": 1965,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 863.8833312988281,\r
+        "y": 1929,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e035263.0ab9c4",\r
+        "id": "f72f31f7.42e17",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 880.8833312988281,\r
-        "y": 2024,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 866.8833312988281,\r
+        "y": 1988,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "fc704734.f5a92",\r
-                "534cefd0.094168"\r
+                "c01095c8.c5a848",\r
+                "1e0b480.37d7ab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e9fd2d9.fce4a8",\r
+        "id": "f8f2651c.3a035",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
         "comments": "",\r
-        "x": 279.8833312988281,\r
-        "y": 2523,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 265.8833312988281,\r
+        "y": 2487,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e44ba6b.3875e6",\r
+        "id": "f84d6f72.692148",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 422.8833312988281,\r
-        "y": 2583,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 408.8833312988281,\r
+        "y": 2547,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "b4c4bd8d.d5bdc",\r
-                "c813638c.89d0f"\r
+                "7174c4fb.4236d4",\r
+                "3df090d7.e28cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4c4bd8d.d5bdc",\r
+        "id": "7174c4fb.4236d4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 735.3833312988281,\r
-        "y": 2560,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 721.3833312988281,\r
+        "y": 2524,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c813638c.89d0f",\r
+        "id": "3df090d7.e28cf",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 739.3833312988281,\r
-        "y": 2600,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 725.3833312988281,\r
+        "y": 2564,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "3e668730.81c5e8"\r
+                "bbef1ecc.7916"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c6aee6c.a3a53a",\r
+        "id": "4d6cfe8e.59e2a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 915.3833312988281,\r
-        "y": 2564,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 901.3833312988281,\r
+        "y": 2528,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e668730.81c5e8",\r
+        "id": "bbef1ecc.7916",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 930.8833312988281,\r
-        "y": 2618,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 916.8833312988281,\r
+        "y": 2582,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "e6168d7c.f871d"\r
+                "b94bbfec.158258"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59cef6d7.b8a21",\r
+        "id": "b2dda6de.cb3b28",\r
         "type": "save",\r
         "name": "update vpn-binding resource (aka. OTN ) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1226.3833312988281,\r
-        "y": 2587,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1212.3833312988281,\r
+        "y": 2551,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b5303ab1.d78928",\r
+        "id": "1cb10652.ba5e0a",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 2693.383331298828,\r
-        "y": 1938,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2679.383331298828,\r
+        "y": 1902,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e6168d7c.f871d",\r
+        "id": "b94bbfec.158258",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1188.3833312988281,\r
-        "y": 2629,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1174.3833312988281,\r
+        "y": 2593,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "878444f9.a47b7",\r
+        "id": "70ed09af.22122",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",\r
         "comments": "",\r
-        "x": 598.3833312988281,\r
-        "y": 1307,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 584.3833312988281,\r
+        "y": 1271,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e2c4a442.f42cf",\r
+        "id": "dfffb0d0.b2d2d",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",\r
         "comments": "",\r
-        "x": 611.3833312988281,\r
-        "y": 1403,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 597.3833312988281,\r
+        "y": 1367,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd4c3392.e1b02",\r
+        "id": "9521e4ca.a61af",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4347.883331298828,\r
-        "y": 579,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4333.883331298828,\r
+        "y": 543,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9c0b0957.1e6c48",\r
+        "id": "1d1e23b2.17cb04",\r
         "type": "save",\r
         "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4250.883331298828,\r
-        "y": 1398,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4236.883331298828,\r
+        "y": 1362,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "88e8f378.a2b808",\r
+        "id": "e35a6c95.6b3d6",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3744.883331298828,\r
-        "y": 2070,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3730.883331298828,\r
+        "y": 2034,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "41f16b19.4ea28c",\r
+        "id": "9c5806bb.83c05",\r
         "type": "switchNode",\r
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",\r
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 845.8833312988281,\r
-        "y": 878,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 831.8833312988281,\r
+        "y": 842,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "7bf4aa70.c75d74",\r
-                "a798281b.2c68d8"\r
+                "24382f34.66808",\r
+                "ea56d949.8ce4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bf4aa70.c75d74",\r
+        "id": "24382f34.66808",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1208.8833312988281,\r
-        "y": 901,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1194.8833312988281,\r
+        "y": 865,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "e5a55559.f1ecf"\r
+                "d7ed30c6.74c9b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a798281b.2c68d8",\r
+        "id": "ea56d949.8ce4b",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1208.8833312988281,\r
-        "y": 850,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1194.8833312988281,\r
+        "y": 814,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "486913c4.08fb54"\r
+                "3707e8cf.65827"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5a55559.f1ecf",\r
+        "id": "d7ed30c6.74c9b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1364.8833312988281,\r
-        "y": 899,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1350.8833312988281,\r
+        "y": 863,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "a3b35ff6.7d4a88"\r
+                "a7f36b9f.f75b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "486913c4.08fb54",\r
+        "id": "3707e8cf.65827",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1341.8833312988281,\r
-        "y": 851,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1327.8833312988281,\r
+        "y": 815,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4660bf61.473a18",\r
+        "id": "ed4d0298.cdb578",\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.883331298828,\r
-        "y": 249,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2087.883331298828,\r
+        "y": 213,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1fda4b4a.2131e5",\r
+        "id": "1ced8517.ce35e3",\r
         "type": "set",\r
         "name": "set root-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 3643.883331298828,\r
-        "y": 2230,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3629.883331298828,\r
+        "y": 2194,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a6ffb7c.8797f4",\r
+        "id": "224f4283.917d26",\r
         "type": "set",\r
         "name": "set leaf-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 4233.883331298828,\r
-        "y": 703,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4219.883331298828,\r
+        "y": 667,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3af61e2.8efbd8",\r
+        "id": "b85bac18.623698",\r
         "type": "set",\r
         "name": "set ethernet-srv-end-points-list array",\r
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1407.8833312988281,\r
-        "y": 1809,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1393.8833312988281,\r
+        "y": 1773,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14d69ea3.c37079",\r
+        "id": "5524ecac.5cf47c",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",\r
         "comments": "",\r
-        "x": 586.8833312988281,\r
-        "y": 1543,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 572.8833312988281,\r
+        "y": 1507,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e39ba7bd.aed5d8",\r
+        "id": "a12bd239.f8368",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 617.8833312988281,\r
-        "y": 1583,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 603.8833312988281,\r
+        "y": 1547,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fc704734.f5a92",\r
+        "id": "c01095c8.c5a848",\r
         "type": "set",\r
         "name": "set otn-tunnels-name-list array",\r
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1165.8833312988281,\r
-        "y": 1991,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1151.8833312988281,\r
+        "y": 1955,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "534cefd0.094168",\r
+        "id": "1e0b480.37d7ab8",\r
         "type": "set",\r
         "name": "set otn-tunnels-name-list array",\r
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1168.8833312988281,\r
-        "y": 2033,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1154.8833312988281,\r
+        "y": 1997,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "de368aef.16cb",\r
+        "id": "5d1396ed.19b6f8",\r
         "type": "set",\r
         "name": "unset otn-tunnels-name-list array",\r
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",\r
         "comments": "",\r
-        "x": 611.8833312988281,\r
-        "y": 1673,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 597.8833312988281,\r
+        "y": 1637,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "61a182f0.95ec2c",\r
+        "id": "1b4871a6.1cd8a6",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
         "comments": "",\r
-        "x": 366.8833312988281,\r
-        "y": 2052,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 352.8833312988281,\r
+        "y": 2016,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fae7aeca.a940b8",\r
+        "id": "48083140.e99758",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 374.8833312988281,\r
-        "y": 2109,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 360.8833312988281,\r
+        "y": 2073,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1dbcecbe.b5c9a3",\r
+        "id": "d97c4e37.51bad8",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1385.8833312988281,\r
-        "y": 1658,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1371.8833312988281,\r
+        "y": 1622,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "2facd73.aebb428",\r
-                "7c34f1f3.22e088"\r
+                "3df77641.8d727a",\r
+                "f024d61d.5a31c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c34f1f3.22e088",\r
+        "id": "f024d61d.5a31c",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1608.8833312988281,\r
-        "y": 1613,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1594.8833312988281,\r
+        "y": 1577,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "7e28ac3f.b53f7c"\r
+                "3c67000e.e921c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2facd73.aebb428",\r
+        "id": "3df77641.8d727a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1610.8833312988281,\r
-        "y": 1677,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1596.8833312988281,\r
+        "y": 1641,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "c1661a7d.0e642"\r
+                "de64177a.8916f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e28ac3f.b53f7c",\r
+        "id": "3c67000e.e921c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1773.8833312988281,\r
-        "y": 1610,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1759.8833312988281,\r
+        "y": 1574,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "a55c6cbe.f3cef"\r
+                "9bea7c66.5f62c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1661a7d.0e642",\r
+        "id": "de64177a.8916f",\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": 1772.8833312988281,\r
-        "y": 1673,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1758.8833312988281,\r
+        "y": 1637,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a55c6cbe.f3cef",\r
+        "id": "9bea7c66.5f62c8",\r
         "type": "set",\r
         "name": "set tmp.uni-node-id-short",\r
-        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />\n",\r
+        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
         "comments": "",\r
-        "x": 1993.8833312988281,\r
-        "y": 1624,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1979.8833312988281,\r
+        "y": 1588,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3eb9377.85c18",\r
+        "id": "7a38583b.020a88",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1538.8833312988281,\r
-        "y": 2349,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1524.8833312988281,\r
+        "y": 2313,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "fcb0361d.62eb48"\r
+                "c388a6bf.f87f3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcd8db20.d12b7",\r
+        "id": "a2f5b878.ad169",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1923.8833312988281,\r
-        "y": 2362,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1909.8833312988281,\r
+        "y": 2326,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "62f93408.d79154",\r
-                "c38cc9d8.7f1bc",\r
-                "576ffe09.c4abd8"\r
+                "7866488b.2039a8",\r
+                "bdc692ef.1c0858",\r
+                "823a852f.40d29"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fcb0361d.62eb48",\r
+        "id": "c388a6bf.f87f3",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1717.8833312988281,\r
-        "y": 2349,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1703.8833312988281,\r
+        "y": 2313,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "90857791.e16908",\r
-                "dcd8db20.d12b7"\r
+                "5c79d6d8.a6a8e",\r
+                "a2f5b878.ad169"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90857791.e16908",\r
+        "id": "5c79d6d8.a6a8e",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainConn id",\r
         "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 1953.8833312988281,\r
-        "y": 2310,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1939.8833312988281,\r
+        "y": 2274,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "62f93408.d79154",\r
+        "id": "7866488b.2039a8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2133.883331298828,\r
-        "y": 2353,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2119.883331298828,\r
+        "y": 2317,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "2c548a06.655d4e"\r
+                "4da79570.cd80cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c38cc9d8.7f1bc",\r
+        "id": "bdc692ef.1c0858",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2125.883331298828,\r
-        "y": 2408,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2111.883331298828,\r
+        "y": 2372,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "99196e80.99674"\r
+                "5ef7fec5.5efb98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "576ffe09.c4abd8",\r
+        "id": "823a852f.40d29",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2130.883331298828,\r
-        "y": 2465,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2116.883331298828,\r
+        "y": 2429,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "ea704904.f61c3"\r
+                "57488074.1d65e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea704904.f61c3",\r
+        "id": "57488074.1d65e",\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": 2282.883331298828,\r
-        "y": 2466,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2268.883331298828,\r
+        "y": 2430,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "99196e80.99674",\r
+        "id": "5ef7fec5.5efb98",\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": 2293.883331298828,\r
-        "y": 2411,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2279.883331298828,\r
+        "y": 2375,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c548a06.655d4e",\r
+        "id": "4da79570.cd80cc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2278.265655517578,\r
-        "y": 2350.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2264.265655517578,\r
+        "y": 2314.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "55de506e.ab2138"\r
+                "69f8caaf.bba51c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55de506e.ab2138",\r
+        "id": "69f8caaf.bba51c",\r
         "type": "set",\r
         "name": "set controller domainConn data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 2492.883331298828,\r
-        "y": 2347,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2478.883331298828,\r
+        "y": 2311,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2eeb0084.f61b88",\r
+        "id": "53cc84ce.e1faf4",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 616.8833312988281,\r
-        "y": 2395,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 602.8833312988281,\r
+        "y": 2359,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "21d8f2c9.3cd2be",\r
-                "32ff82a0.3bb24e",\r
-                "21eb3441.66cbb4"\r
+                "bb343bdc.881868",\r
+                "8bc84f5e.0473d8",\r
+                "78444b47.33ec34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21d8f2c9.3cd2be",\r
+        "id": "bb343bdc.881868",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 812.3834533691406,\r
-        "y": 2347,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 798.3834533691406,\r
+        "y": 2311,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "2571d7b1.c4fb5"\r
+                "bf3ecbb9.4dd008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32ff82a0.3bb24e",\r
+        "id": "8bc84f5e.0473d8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 804.3834533691406,\r
-        "y": 2402,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 790.3834533691406,\r
+        "y": 2366,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "b0a2917a.ecde4"\r
+                "ef40b092.bc09e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2571d7b1.c4fb5",\r
+        "id": "bf3ecbb9.4dd008",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 956.7657775878906,\r
-        "y": 2346.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 942.7657775878906,\r
+        "y": 2310.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "a50320.52c78ce"\r
+                "1285266.d4ce8da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a50320.52c78ce",\r
+        "id": "1285266.d4ce8da",\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": 1140.8833312988281,\r
-        "y": 2345,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1126.8833312988281,\r
+        "y": 2309,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "b3deb273.cebb88"\r
+                "640d04c1.8428dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3deb273.cebb88",\r
+        "id": "640d04c1.8428dc",\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": 1335.8833312988281,\r
-        "y": 2345,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1321.8833312988281,\r
+        "y": 2309,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "a3eb9377.85c18"\r
+                "7a38583b.020a88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21eb3441.66cbb4",\r
+        "id": "78444b47.33ec34",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 809.3834533691406,\r
-        "y": 2459,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 795.3834533691406,\r
+        "y": 2423,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "f2a9e7b0.6a4ff8"\r
+                "b417de17.8b3a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f2a9e7b0.6a4ff8",\r
+        "id": "b417de17.8b3a6",\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": 961.3834533691406,\r
-        "y": 2460,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 947.3834533691406,\r
+        "y": 2424,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b0a2917a.ecde4",\r
+        "id": "ef40b092.bc09e",\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": 972.3834533691406,\r
-        "y": 2403,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 958.3834533691406,\r
+        "y": 2367,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e821cf32.5b22f",\r
+        "id": "fc4eafc.4810e5",\r
         "type": "set",\r
         "name": "set tmp.pnf-name-forUrl",\r
         "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 606.8833312988281,\r
-        "y": 2307,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 592.8833312988281,\r
+        "y": 2271,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f92bafd0.7c69c8",\r
+        "id": "d94511cd.5d63f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 351.8833312988281,\r
-        "y": 2438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 337.8833312988281,\r
+        "y": 2402,\r
+        "z": "db287b1f.2984a8",\r
         "wires": [\r
             [\r
-                "e821cf32.5b22f",\r
-                "2eeb0084.f61b88"\r
+                "fc4eafc.4810e5",\r
+                "53cc84ce.e1faf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a832f3b6.8874e",\r
+        "id": "1a955b8d.047dd4",\r
         "type": "comment",\r
         "name": "Temporary skipping this check - to support multiple instances in one slice",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1566.8500061035156,\r
-        "y": 255.88333129882812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1552.8500061035156,\r
+        "y": 219.88333129882812,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f645589d.ed3d98",\r
+        "id": "9a0e1ef7.428b9",\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": 768.8833312988281,\r
-        "y": 478,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 754.8833312988281,\r
+        "y": 442,\r
+        "z": "db287b1f.2984a8",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
index d0f35f9..c1b37ce 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
@@ -1,20 +1,20 @@
 [\r
   {\r
-    "id": "401457dc.d91b78",\r
+    "id": "458f4ac.c4718b4",\r
     "type": "dgstart",\r
     "name": "DGSTART",\r
     "outputs": 1,\r
-    "x": 112,\r
-    "y": 81,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 134.88333129882812,\r
+    "y": 96.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "a013fef2.6f2958"\r
+        "2b796419.174294"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a013fef2.6f2958",\r
+    "id": "2b796419.174294",\r
     "type": "service-logic",\r
     "name": "GENERIC-RESOURCE-API ${project.version}",\r
     "module": "GENERIC-RESOURCE-API",\r
@@ -22,5633 +22,5709 @@
     "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": 396.2856903076172,\r
-    "y": 142.23810863494873,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 419.1690216064453,\r
+    "y": 158.12143993377686,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "6ff7b54f.12fd9c"\r
+        "81638429.4a926"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6ff7b54f.12fd9c",\r
+    "id": "81638429.4a926",\r
     "type": "method",\r
     "name": "method cll-vnf-topology-operation-cll-create-clean",\r
     "xml": "<method rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 402.42860412597656,\r
-    "y": 227.00003051757812,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 425.3119354248047,\r
+    "y": 242.88336181640625,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "515432f3.743c34"\r
+        "49ee9c33.493f7c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "515432f3.743c34",\r
+    "id": "49ee9c33.493f7c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 752,\r
-    "y": 286,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 774.8833312988281,\r
+    "y": 301.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "dd15978c.a7e49",\r
-        "818743.6c6790c",\r
-        "ecb6f865.396d18"\r
+        "a4831915.5eaaa",\r
+        "7639e853.9511c8",\r
+        "a54eb7d5.3629"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dd15978c.a7e49",\r
+    "id": "a4831915.5eaaa",\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": 1053.33349609375,\r
-    "y": 556.9302978515625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1076.2168273925781,\r
+    "y": 572.8136291503906,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "818743.6c6790c",\r
+    "id": "7639e853.9511c8",\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": 1074.761962890625,\r
-    "y": 259.33331298828125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1097.6452941894531,\r
+    "y": 275.2166442871094,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "5ecdc66f.f6a9f8",\r
-        "a5115d.53bf7ea",\r
-        "6a040cf4.34a5f4"\r
+        "46a7c921.f80be8",\r
+        "fa1c1252.bcac98",\r
+        "22347b09.105eec"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5ecdc66f.f6a9f8",\r
+    "id": "46a7c921.f80be8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1299.761962890625,\r
-    "y": 117.33331298828125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1322.6452941894531,\r
+    "y": 133.21664428710938,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "79d6f337.acb234"\r
+        "f818b9cf.ba44c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a5115d.53bf7ea",\r
+    "id": "fa1c1252.bcac98",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1295.2529296875,\r
-    "y": 186.9073486328125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1318.1362609863281,\r
+    "y": 202.79067993164062,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "5f1113a0.08e40c"\r
+        "7ac2bf1b.1c3bb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6a040cf4.34a5f4",\r
+    "id": "22347b09.105eec",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1283.761962890625,\r
-    "y": 233.33331298828125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1306.6452941894531,\r
+    "y": 249.21664428710938,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "90f3a407.501d38"\r
+        "9932a9c7.205738"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "de3b14d3.6ada2",\r
+    "id": "3db9725e.eccbce",\r
     "type": "comment",\r
     "name": "new for TransportSlicing",\r
     "info": "",\r
     "comments": "",\r
-    "x": 1053.761962890625,\r
-    "y": 147.33331298828125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1076.6452941894531,\r
+    "y": 163.21664428710938,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ecb6f865.396d18",\r
+    "id": "a54eb7d5.3629",\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": 1041.761962890625,\r
-    "y": 199.33331298828125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1064.6452941894531,\r
+    "y": 215.21664428710938,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "79d6f337.acb234",\r
+    "id": "f818b9cf.ba44c",\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": 1540,\r
-    "y": 114,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1562.8833312988281,\r
+    "y": 129.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "43c20e21.f32cd8",\r
-        "28c5af7a.923d38"\r
+        "8e919d6f.673508",\r
+        "51e0925d.04913c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5f1113a0.08e40c",\r
+    "id": "7ac2bf1b.1c3bb8",\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": 1450.0623779296875,\r
-    "y": 189.85977172851562,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1472.9457092285156,\r
+    "y": 205.74310302734375,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "90f3a407.501d38",\r
+    "id": "9932a9c7.205738",\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": 1454,\r
-    "y": 234,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1476.8833312988281,\r
+    "y": 249.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "43c20e21.f32cd8",\r
+    "id": "8e919d6f.673508",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1745,\r
-    "y": 151,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1767.8833312988281,\r
+    "y": 166.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "80d61dda.518fc"\r
+        "68453177.cb78b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "28c5af7a.923d38",\r
+    "id": "51e0925d.04913c",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1755,\r
-    "y": 78,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1777.8833312988281,\r
+    "y": 93.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "80d61dda.518fc",\r
+    "id": "68453177.cb78b8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1738,\r
-    "y": 226,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1760.8833312988281,\r
+    "y": 241.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "28653cf0.44562c",\r
-        "75a68f8a.78ad9",\r
-        "3bc8660b.b8496a",\r
-        "1213b45b.844d1c",\r
-        "2c9dde75.d2cff2"\r
+        "a82eb2b4.74145",\r
+        "2f11fd49.33bf4a",\r
+        "3f7479d2.cf6ebe",\r
+        "9bc906e5.702fc8",\r
+        "a8e7354f.a1833"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "98945bed.eff0a8",\r
+    "id": "c81e4e53.d33bf",\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": 2224,\r
-    "y": 277,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2246.883331298828,\r
+    "y": 292.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "2960f1eb.c720a6",\r
-        "872a9fc7.c0cff",\r
-        "8c06b22e.eee49"\r
+        "93e1f14a.5a9588",\r
+        "d05d8571.8f54d8",\r
+        "43bb6a89.efb504"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2960f1eb.c720a6",\r
+    "id": "93e1f14a.5a9588",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2440,\r
-    "y": 344,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2462.883331298828,\r
+    "y": 359.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "c7e960b7.dc23f"\r
+        "29fa3a31.28ab1e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "872a9fc7.c0cff",\r
+    "id": "d05d8571.8f54d8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2440.490966796875,\r
-    "y": 243.573974609375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2463.374298095703,\r
+    "y": 259.4573059082031,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "6cf8dc3d.cca5ac"\r
+        "9a07cfe7.b03588"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8c06b22e.eee49",\r
+    "id": "43bb6a89.efb504",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2436,\r
-    "y": 293,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2458.883331298828,\r
+    "y": 308.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "9afdf1e0.0463b"\r
+        "b1a3ba46.e979e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "28653cf0.44562c",\r
+    "id": "a82eb2b4.74145",\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": 1941,\r
-    "y": 258,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1963.8833312988281,\r
+    "y": 273.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "b0c3b925.5a198",\r
-        "98945bed.eff0a8",\r
-        "59db3330.69645c",\r
-        "4ebbcee7.69b52"\r
+        "9e7211a2.fa3648",\r
+        "c81e4e53.d33bf",\r
+        "d050303.0f4a3d",\r
+        "c2f95f80.985fc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b0c3b925.5a198",\r
+    "id": "9e7211a2.fa3648",\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": 2221,\r
-    "y": 196,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2243.883331298828,\r
+    "y": 211.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1213b45b.844d1c",\r
+    "id": "9bc906e5.702fc8",\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": 1915,\r
-    "y": 208,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1937.8833312988281,\r
+    "y": 223.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "75a68f8a.78ad9",\r
+    "id": "2f11fd49.33bf4a",\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": 1958,\r
-    "y": 67,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1980.8833312988281,\r
+    "y": 82.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3bc8660b.b8496a",\r
+    "id": "3f7479d2.cf6ebe",\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": 1970,\r
-    "y": 108,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1992.8833312988281,\r
+    "y": 123.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "886bedb4.af1a3",\r
+    "id": "ea819687.b3e55",\r
     "type": "comment",\r
     "name": "The following two nodes are for PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 1995,\r
-    "y": 20,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2017.8833312988281,\r
+    "y": 35.883331298828125,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1506b37b.81c545",\r
+    "id": "a0a17876.3d9168",\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": 1915,\r
-    "y": 154,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 1937.8833312988281,\r
+    "y": 169.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6cf8dc3d.cca5ac",\r
+    "id": "9a07cfe7.b03588",\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": 2619,\r
-    "y": 246,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2641.883331298828,\r
+    "y": 261.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9afdf1e0.0463b",\r
+    "id": "b1a3ba46.e979e8",\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": 2618.9375,\r
-    "y": 295.1402587890625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2641.820831298828,\r
+    "y": 311.0235900878906,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c7e960b7.dc23f",\r
+    "id": "29fa3a31.28ab1e",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2620.9375,\r
-    "y": 346.1402587890625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2643.820831298828,\r
+    "y": 362.0235900878906,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "39c57327.b8862c"\r
+        "ccdb352a.c0afb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "39c57327.b8862c",\r
+    "id": "ccdb352a.c0afb",\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": 2913.9375,\r
-    "y": 293.1402587890625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2936.820831298828,\r
+    "y": 309.0235900878906,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "3bec086a.17141",\r
-        "202b395f.8fc9be",\r
-        "205a58b1.00a5c"\r
+        "1d1c178.a002b69",\r
+        "a96469cb.c566d8",\r
+        "1d270f4d.7f92d9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "202b395f.8fc9be",\r
+    "id": "a96469cb.c566d8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3187.428466796875,\r
-    "y": 185.7142333984375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3210.311798095703,\r
+    "y": 201.59756469726562,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "113df3fa.92a3d4"\r
+        "a9051800.9d7288"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "113df3fa.92a3d4",\r
+    "id": "a9051800.9d7288",\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": 3365,\r
-    "y": 186,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3387.883331298828,\r
+    "y": 201.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "205a58b1.00a5c",\r
+    "id": "1d270f4d.7f92d9",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3182.9375,\r
-    "y": 235.1402587890625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3205.820831298828,\r
+    "y": 251.02359008789062,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "158df1dd.6f3716"\r
+        "74b9715b.81c6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "158df1dd.6f3716",\r
+    "id": "74b9715b.81c6",\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": 3364.9375,\r
-    "y": 235.1402587890625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3387.820831298828,\r
+    "y": 251.02359008789062,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3bec086a.17141",\r
+    "id": "1d1c178.a002b69",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3186.9375,\r
-    "y": 286.1402587890625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3209.820831298828,\r
+    "y": 302.0235900878906,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "b7f25fb9.397e68"\r
+        "dea72b0a.7f4d98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b7f25fb9.397e68",\r
+    "id": "dea72b0a.7f4d98",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3366.9375,\r
-    "y": 286.1402587890625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3389.820831298828,\r
+    "y": 302.0235900878906,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "b5f441a1.12264"\r
+        "1a6bb71b.cc26c9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b5f441a1.12264",\r
+    "id": "1a6bb71b.cc26c9",\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": 2933,\r
-    "y": 421,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2955.883331298828,\r
+    "y": 436.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "8b1d1a2b.bf0fd8",\r
-        "1b31225e.143a7e"\r
+        "24693fb2.e93b7",\r
+        "a9c05c16.6229b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1b31225e.143a7e",\r
+    "id": "a9c05c16.6229b8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3243,\r
-    "y": 428,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3265.883331298828,\r
+    "y": 443.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8b1d1a2b.bf0fd8",\r
+    "id": "24693fb2.e93b7",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3242,\r
-    "y": 482,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3264.883331298828,\r
+    "y": 497.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f82eb181.80b6b8"\r
+        "54d9e040.3e5a2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a23264d4.676238",\r
+    "id": "7514cb1e.22b7cc",\r
     "type": "outcome",\r
     "name": "network-policy",\r
     "xml": "<outcome value='network-policy'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3987,\r
-    "y": 436,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4009.883331298828,\r
+    "y": 451.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "ff9fd818.342fc"\r
+        "1a1e9340.1cb465"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ff9fd818.342fc",\r
+    "id": "1a1e9340.1cb465",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4163.9998779296875,\r
-    "y": 428.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4186.883209228516,\r
+    "y": 444.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "792ffad7.7e059c",\r
-        "f4f213f7.1f09b"\r
+        "1cd3fabc.2c7055",\r
+        "df5b418a.0dd23"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f82eb181.80b6b8",\r
+    "id": "54d9e040.3e5a2",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3406,\r
-    "y": 408,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3428.883331298828,\r
+    "y": 423.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "ecdd8960.6c28f",\r
-        "89ab1181.5cfe68"\r
+        "dde05d5d.d568e8",\r
+        "89905857.784518"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ecdd8960.6c28f",\r
+    "id": "dde05d5d.d568e8",\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": 3687,\r
-    "y": 364,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3709.883331298828,\r
+    "y": 379.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "b496725b.6310f"\r
+        "abe51cd7.f8f208"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b496725b.6310f",\r
+    "id": "abe51cd7.f8f208",\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": 3949,\r
-    "y": 364,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3971.883331298828,\r
+    "y": 379.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "a23264d4.676238"\r
+        "7514cb1e.22b7cc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "792ffad7.7e059c",\r
+    "id": "1cd3fabc.2c7055",\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": 4406.9998779296875,\r
-    "y": 385.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4429.883209228516,\r
+    "y": 401.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f4f213f7.1f09b",\r
+    "id": "df5b418a.0dd23",\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": 4395.9998779296875,\r
-    "y": 440.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4418.883209228516,\r
+    "y": 456.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "738543a5.e85744",\r
-        "13a5e063.163af8",\r
-        "e90bc7b5.1f09c"\r
+        "b1c8bb90.0c2e78",\r
+        "2f32ddcf.c1426a",\r
+        "a81fdee7.10c348"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e90bc7b5.1f09c",\r
+    "id": "a81fdee7.10c348",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4649,\r
-    "y": 327,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4671.883331298828,\r
+    "y": 342.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "5d8fd93.58407a8"\r
+        "933dded8.905d48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5d8fd93.58407a8",\r
+    "id": "933dded8.905d48",\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": 4797.571533203125,\r
-    "y": 327.2857666015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4820.454864501953,\r
+    "y": 343.1690979003906,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "53518ce7.6d697c",\r
+    "id": "4ff8891b.b27e6",\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": 4796.509033203125,\r
-    "y": 371.426025390625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4819.392364501953,\r
+    "y": 387.3093566894531,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "13a5e063.163af8",\r
+    "id": "2f32ddcf.c1426a",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4637.509033203125,\r
-    "y": 371.426025390625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4660.392364501953,\r
+    "y": 387.3093566894531,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "53518ce7.6d697c"\r
+        "4ff8891b.b27e6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "738543a5.e85744",\r
+    "id": "b1c8bb90.0c2e78",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4644.509033203125,\r
-    "y": 450.426025390625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4667.392364501953,\r
+    "y": 466.3093566894531,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "937d3d5d.26f97"\r
+        "9b0431ef.52336"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "937d3d5d.26f97",\r
+    "id": "9b0431ef.52336",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4783.509033203125,\r
-    "y": 450.426025390625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4806.392364501953,\r
+    "y": 466.3093566894531,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "72f3c760.2ca228",\r
-        "8ec14dfe.92b848"\r
+        "30420590.b9ff82",\r
+        "80a75b67.8413b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "72f3c760.2ca228",\r
+    "id": "30420590.b9ff82",\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": 4989,\r
-    "y": 448,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5011.883331298828,\r
+    "y": 463.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8ec14dfe.92b848",\r
+    "id": "80a75b67.8413b8",\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": 4988,\r
-    "y": 494,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5010.883331298828,\r
+    "y": 509.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "89ab1181.5cfe68",\r
+    "id": "89905857.784518",\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": 3504,\r
-    "y": 480,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3526.883331298828,\r
+    "y": 495.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f7fb6622.9ee6a8"\r
+        "b46dcd3d.f4afe8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f7fb6622.9ee6a8",\r
+    "id": "b46dcd3d.f4afe8",\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": 3784,\r
-    "y": 480,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3806.883331298828,\r
+    "y": 495.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "ae35e793.89faa8"\r
+        "f685aa80.8cfb4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ae35e793.89faa8",\r
+    "id": "f685aa80.8cfb4",\r
     "type": "outcome",\r
     "name": "logical-link",\r
     "xml": "<outcome value='logical-link'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2197.0001220703125,\r
-    "y": 733.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2219.8834533691406,\r
+    "y": 748.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "c9798d0a.ecd3b"\r
+        "a18b2354.2da15"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c9798d0a.ecd3b",\r
+    "id": "a18b2354.2da15",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2374,\r
-    "y": 726,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2396.883331298828,\r
+    "y": 741.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "c196b024.7ddda8",\r
-        "7125c66b.59e98"\r
+        "ea2df6b1.4ac208",\r
+        "5238e333.611ed4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c196b024.7ddda8",\r
+    "id": "ea2df6b1.4ac208",\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": 2617,\r
-    "y": 683,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2639.883331298828,\r
+    "y": 698.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7125c66b.59e98",\r
+    "id": "5238e333.611ed4",\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": 2606,\r
-    "y": 738,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2628.883331298828,\r
+    "y": 753.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "9959c5db.04ddc8",\r
-        "5c37ab7d.23ef4c",\r
-        "360651b5.116166"\r
+        "d29bd2a6.f0278",\r
+        "aae66833.e493",\r
+        "51948363.691cec"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9959c5db.04ddc8",\r
+    "id": "d29bd2a6.f0278",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2897.490966796875,\r
-    "y": 716.573974609375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2920.374298095703,\r
+    "y": 732.4573059082031,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "95b8ba37.0aee2"\r
+        "a5baff8.5c15f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5c37ab7d.23ef4c",\r
+    "id": "aae66833.e493",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2886,\r
-    "y": 761,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2908.883331298828,\r
+    "y": 776.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f8728a74.d6db68"\r
+        "590adc04.7c8c64"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "95b8ba37.0aee2",\r
+    "id": "a5baff8.5c15f",\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": 3046.0625,\r
-    "y": 716.8597412109375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3068.945831298828,\r
+    "y": 732.7430725097656,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f8728a74.d6db68",\r
+    "id": "590adc04.7c8c64",\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": 3045,\r
-    "y": 761,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3067.883331298828,\r
+    "y": 776.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "360651b5.116166",\r
+    "id": "51948363.691cec",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2893,\r
-    "y": 840,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2915.883331298828,\r
+    "y": 855.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "7326b1f2.1f515"\r
+        "138db6d7.8d5031"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7326b1f2.1f515",\r
+    "id": "138db6d7.8d5031",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3032,\r
-    "y": 840,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3054.883331298828,\r
+    "y": 855.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "defc50da.4e3908",\r
-        "b7df8e67.09b008",\r
-        "8bf3b76.abce348",\r
-        "25a0f8e1.052e18",\r
-        "b381c251.6b96c",\r
-        "89e7916b.fb9e18",\r
-        "5511f093.c411d8",\r
-        "d2628754.9207b8",\r
-        "6481b806.b26798",\r
-        "20bb7eae.be3a32",\r
-        "9fcb0922.e08ed",\r
-        "3db2acf8.6fe83c",\r
-        "d8a34ec.a6346b",\r
-        "2783e99.3726216"\r
+        "7a4c5f2f.9027d8",\r
+        "f3e41369.61302",\r
+        "bb0c73ed.00d09",\r
+        "8e9b40a2.60b6c",\r
+        "bda9878c.43ffc8",\r
+        "746b18d4.be3d18",\r
+        "15698ad5.b40d3d",\r
+        "3d22a200.42e29e",\r
+        "ff1965cc.9c6318",\r
+        "a8011cb7.dd8288",\r
+        "60be6b60.c49e7c",\r
+        "77fe2bdc.eed0c4",\r
+        "c658e7ef.0b11d8",\r
+        "d48a24b6.db8ce8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "57e34af8.6ff4e4",\r
+    "id": "f45cdd5f.c90798",\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": 3346,\r
-    "y": 646,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3368.883331298828,\r
+    "y": 661.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "defc50da.4e3908",\r
+    "id": "7a4c5f2f.9027d8",\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": 3327,\r
-    "y": 696,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3349.883331298828,\r
+    "y": 711.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2783e99.3726216",\r
+    "id": "d48a24b6.db8ce8",\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": 3284,\r
-    "y": 741,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3306.883331298828,\r
+    "y": 756.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b7df8e67.09b008",\r
+    "id": "f3e41369.61302",\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": 3259,\r
-    "y": 804,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3281.883331298828,\r
+    "y": 819.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8bf3b76.abce348",\r
+    "id": "bb0c73ed.00d09",\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": 3260,\r
-    "y": 859,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3282.883331298828,\r
+    "y": 874.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "25a0f8e1.052e18",\r
+    "id": "8e9b40a2.60b6c",\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": 3276,\r
-    "y": 907,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3298.883331298828,\r
+    "y": 922.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "bd8c7e03.e7323",\r
-        "d55fdbac.2e4bb8",\r
-        "1bd38601.f7d742"\r
+        "5e527f7c.215cc8",\r
+        "e57980fe.5f9758",\r
+        "d6304ea1.fb76e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b381c251.6b96c",\r
+    "id": "bda9878c.43ffc8",\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": 3265,\r
-    "y": 993.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3287.883331298828,\r
+    "y": 1009.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "1da7e0f.b56889f",\r
-        "484d133e.c5022c",\r
-        "511cb1cb.4e0758"\r
+        "be8da30d.6c1bf8",\r
+        "59df3d01.4ec704",\r
+        "23f36ff9.6f46c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bd8c7e03.e7323",\r
+    "id": "5e527f7c.215cc8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3477,\r
-    "y": 791,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3499.883331298828,\r
+    "y": 806.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "2e4151be.e64316"\r
+        "7280738b.1a48a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d55fdbac.2e4bb8",\r
+    "id": "e57980fe.5f9758",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3472.509033203125,\r
-    "y": 840.426025390625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3495.392364501953,\r
+    "y": 856.3093566894531,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "13e83f49.acd859"\r
+        "74f46c1.d313d14"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1bd38601.f7d742",\r
+    "id": "d6304ea1.fb76e",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3476.509033203125,\r
-    "y": 893.426025390625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3499.392364501953,\r
+    "y": 909.3093566894531,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "bbf6b192.5183e"\r
+        "1f52b8ab.2e56cf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2e4151be.e64316",\r
+    "id": "7280738b.1a48a4",\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": 3625.571533203125,\r
-    "y": 790.2857666015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3648.454864501953,\r
+    "y": 806.1690979003906,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "13e83f49.acd859",\r
+    "id": "74f46c1.d313d14",\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": 3615.509033203125,\r
-    "y": 840.426025390625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3638.392364501953,\r
+    "y": 856.3093566894531,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1da7e0f.b56889f",\r
+    "id": "be8da30d.6c1bf8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3488,\r
-    "y": 963.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3510.883331298828,\r
+    "y": 979.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "27b6a672.93ff42"\r
+        "4c2e6e70.a93be8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "484d133e.c5022c",\r
+    "id": "59df3d01.4ec704",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3483.509033203125,\r
-    "y": 1013.4259033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3506.392364501953,\r
+    "y": 1029.3092346191406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "9dfa6094.6f7fc"\r
+        "25d04654.5e839a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "511cb1cb.4e0758",\r
+    "id": "23f36ff9.6f46c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3484.509033203125,\r
-    "y": 1066.4259033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3507.392364501953,\r
+    "y": 1082.3092346191406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "597eb63e.8508f8"\r
+        "e7e2a18.77a626"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "27b6a672.93ff42",\r
+    "id": "4c2e6e70.a93be8",\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": 3636.571533203125,\r
-    "y": 963.28564453125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3659.454864501953,\r
+    "y": 979.1689758300781,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9dfa6094.6f7fc",\r
+    "id": "25d04654.5e839a",\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": 3626.509033203125,\r
-    "y": 1013.4259033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3649.392364501953,\r
+    "y": 1029.3092346191406,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bbf6b192.5183e",\r
+    "id": "1f52b8ab.2e56cf",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3638,\r
-    "y": 893,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3660.883331298828,\r
+    "y": 908.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "254a0cd4.86f82c"\r
+        "37185a88.04a7d6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "597eb63e.8508f8",\r
+    "id": "e7e2a18.77a626",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3638,\r
-    "y": 1065.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3660.883331298828,\r
+    "y": 1081.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e889443b.6afcf"\r
+        "2a90b49d.030114"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "254a0cd4.86f82c",\r
+    "id": "37185a88.04a7d6",\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": 3810,\r
-    "y": 893,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3832.883331298828,\r
+    "y": 908.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "6d2ef37a.d5fd0c",\r
-        "52c8f078.ee2cf"\r
+        "b7871daf.9b4e8",\r
+        "5be956df.30349"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e889443b.6afcf",\r
+    "id": "2a90b49d.030114",\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": 3811,\r
-    "y": 1066,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3833.883331298828,\r
+    "y": 1081.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "a0b3468.4c1dbb8",\r
-        "ed4bd4a4.7c002"\r
+        "7b05f3d6.ed8c14",\r
+        "ed6ce3d.aa0b8a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6d2ef37a.d5fd0c",\r
+    "id": "b7871daf.9b4e8",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3986,\r
-    "y": 872,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4008.883331298828,\r
+    "y": 887.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e77feac5.4ef39"\r
+        "52465f0e.0c996"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "52c8f078.ee2cf",\r
+    "id": "5be956df.30349",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3988,\r
-    "y": 926,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4010.883331298828,\r
+    "y": 941.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "dc5de667.94277"\r
+        "98cbb890.5e8b88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a0b3468.4c1dbb8",\r
+    "id": "7b05f3d6.ed8c14",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3987,\r
-    "y": 1036,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4009.883331298828,\r
+    "y": 1051.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "79d85b32.4dba8c"\r
+        "d0104e32.ac2ab8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ed4bd4a4.7c002",\r
+    "id": "ed6ce3d.aa0b8a",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3989,\r
-    "y": 1090,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4011.883331298828,\r
+    "y": 1105.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "5799e4b6.bb5c84"\r
+        "8e259d5c.262c5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "985f8e8b.05bee8",\r
+    "id": "c68d1d99.71ec4",\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": 4296,\r
-    "y": 824,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4318.883331298828,\r
+    "y": 839.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f70bc04c.4e53a8",\r
+    "id": "97074ecd.08e3c8",\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": 4289,\r
-    "y": 922,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4311.883331298828,\r
+    "y": 937.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "279fdf30.7efb5",\r
+    "id": "be8be686.f85c68",\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": 4289,\r
-    "y": 1009,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4311.883331298828,\r
+    "y": 1024.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "59ab7a89.d7cd04",\r
+    "id": "3fa3de22.b5b33a",\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": 4293,\r
-    "y": 1102,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4315.883331298828,\r
+    "y": 1117.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "88375125.392df",\r
+    "id": "bd818350.b1a8a8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3520,\r
-    "y": 1511,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3542.883331298828,\r
+    "y": 1526.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "70cb5f48.205d5"\r
+        "56ff5ea8.b777"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f9f9639f.39277",\r
+    "id": "ec755270.8f35e8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3529.490966796875,\r
-    "y": 1553.5740356445312,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3552.374298095703,\r
+    "y": 1569.4573669433594,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "3188784d.74df2"\r
+        "e382dfde.5b31d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5caadc0.419f8a4",\r
+    "id": "c9437d33.ef4e6",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3518,\r
-    "y": 1600,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3540.883331298828,\r
+    "y": 1615.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "150b9d67.7501b3"\r
+        "f857e1e2.07be58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3a7a9a9d.f62dc6",\r
+    "id": "5760f0e8.25dba",\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": 3220,\r
-    "y": 1473,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3242.883331298828,\r
+    "y": 1488.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5511f093.c411d8",\r
+    "id": "15698ad5.b40d3d",\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": 3263,\r
-    "y": 1538,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3285.883331298828,\r
+    "y": 1553.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "88375125.392df",\r
-        "f9f9639f.39277",\r
-        "5caadc0.419f8a4"\r
+        "bd818350.b1a8a8",\r
+        "ec755270.8f35e8",\r
+        "c9437d33.ef4e6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "89e7916b.fb9e18",\r
+    "id": "746b18d4.be3d18",\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": 3264,\r
-    "y": 1208,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3286.883331298828,\r
+    "y": 1223.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e837ae68.fc604",\r
-        "bb41717d.607c08"\r
+        "16a316bf.36aa51",\r
+        "5dc43b13.af0e5c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bb41717d.607c08",\r
+    "id": "5dc43b13.af0e5c",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3487,\r
-    "y": 1194,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3509.883331298828,\r
+    "y": 1209.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "d2362461.2f81"\r
+        "4015e76.5fd6098"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e837ae68.fc604",\r
+    "id": "16a316bf.36aa51",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3489,\r
-    "y": 1227,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3511.883331298828,\r
+    "y": 1242.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "3512d9a4.ea10d6"\r
+        "f3f89c52.21e5b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "70cb5f48.205d5",\r
+    "id": "56ff5ea8.b777",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3692.66650390625,\r
-    "y": 1510,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3715.549835205078,\r
+    "y": 1525.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e94025a.e4524d8",\r
-        "c5dba695.8712a"\r
+        "286978b9.608f5",\r
+        "e1e71113.50d348"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3188784d.74df2",\r
+    "id": "e382dfde.5b31d8",\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": 3683.0623779296875,\r
-    "y": 1556.8597717285156,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3705.9457092285156,\r
+    "y": 1572.7431030273438,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "150b9d67.7501b3",\r
+    "id": "f857e1e2.07be58",\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": 3687,\r
-    "y": 1601,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3709.883331298828,\r
+    "y": 1616.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e94025a.e4524d8",\r
+    "id": "286978b9.608f5",\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": 3957,\r
-    "y": 1494,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3979.883331298828,\r
+    "y": 1509.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e5529b75.8cebe8",\r
-        "23d40330.51306c"\r
+        "5b0e63ee.a3ecd4",\r
+        "22c0e5a9.26fd0a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "23d40330.51306c",\r
+    "id": "22c0e5a9.26fd0a",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4180,\r
-    "y": 1449,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4202.883331298828,\r
+    "y": 1464.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "3c287465.76fa9c"\r
+        "bad02ed0.d565e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e5529b75.8cebe8",\r
+    "id": "5b0e63ee.a3ecd4",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4182,\r
-    "y": 1513,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4204.883331298828,\r
+    "y": 1528.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "68bbdd27.0bc724"\r
+        "cba8e08.e7cb12"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "68bbdd27.0bc724",\r
+    "id": "cba8e08.e7cb12",\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": 4344,\r
-    "y": 1509,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4366.883331298828,\r
+    "y": 1524.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3c287465.76fa9c",\r
+    "id": "bad02ed0.d565e8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4345,\r
-    "y": 1446,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4367.883331298828,\r
+    "y": 1461.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "bdb7c671.344b18",\r
-        "c34e936c.c687c"\r
+        "14c7dbb3.7bb934",\r
+        "ad8d4f98.026b1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c36404f4.836da8",\r
+    "id": "b0538c9f.9cd51",\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": 3959,\r
-    "y": 1653,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3981.883331298828,\r
+    "y": 1668.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b7b75306.125ca8",\r
+    "id": "4ca2f9ab.45ab7",\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": 4004,\r
-    "y": 1563,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4026.883331298828,\r
+    "y": 1578.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6cc070b0.831948",\r
+    "id": "ecb8fc16.8423f8",\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": 4087,\r
-    "y": 1701,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4109.883331298828,\r
+    "y": 1716.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3512d9a4.ea10d6",\r
+    "id": "f3f89c52.21e5b8",\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": 3632,\r
-    "y": 1224,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3654.883331298828,\r
+    "y": 1239.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d2362461.2f81",\r
+    "id": "4015e76.5fd6098",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3635,\r
-    "y": 1187,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3657.883331298828,\r
+    "y": 1202.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e726be0e.35ac3",\r
-        "2627d74c.d6bd68"\r
+        "ebd7b0f3.96fde8",\r
+        "1cc07a61.1b7696"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e726be0e.35ac3",\r
+    "id": "ebd7b0f3.96fde8",\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": 3809,\r
-    "y": 1143,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3831.883331298828,\r
+    "y": 1158.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c5dba695.8712a",\r
+    "id": "e1e71113.50d348",\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": 3911,\r
-    "y": 1778,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3933.883331298828,\r
+    "y": 1793.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e649e24c.a2956"\r
+        "bc68df19.413ab"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e649e24c.a2956",\r
+    "id": "bc68df19.413ab",\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": 4117,\r
-    "y": 1778,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4139.883331298828,\r
+    "y": 1793.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "b51c6327.c26b2"\r
+        "50ca2971.ea36d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b51c6327.c26b2",\r
+    "id": "50ca2971.ea36d8",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4332.28564453125,\r
-    "y": 1777.82177734375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4355.168975830078,\r
+    "y": 1793.7051086425781,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "4a081ef3.a11e7"\r
+        "9aafd9b7.eaf6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2627d74c.d6bd68",\r
+    "id": "1cc07a61.1b7696",\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": 3824,\r
-    "y": 1254,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3846.883331298828,\r
+    "y": 1269.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e436419e.4fabd8",\r
-        "652a3cad.15b09c",\r
-        "70700ce3.d1704c"\r
+        "502e27f2.360128",\r
+        "613a0c37.ee93fc",\r
+        "15983fe1.c65378"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e436419e.4fabd8",\r
+    "id": "502e27f2.360128",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4019.5001220703125,\r
-    "y": 1206,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4042.3834533691406,\r
+    "y": 1221.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "cac46a50.7c9a2"\r
+        "ab759fb6.dae2a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "652a3cad.15b09c",\r
+    "id": "613a0c37.ee93fc",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4011.5001220703125,\r
-    "y": 1261,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4034.3834533691406,\r
+    "y": 1276.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "7a559df8.2fbb14"\r
+        "bc752416.e0cbc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "70700ce3.d1704c",\r
+    "id": "15983fe1.c65378",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4016.5001220703125,\r
-    "y": 1318,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4039.3834533691406,\r
+    "y": 1333.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "74d49b92.9fc25c"\r
+        "9670670b.649c48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "74d49b92.9fc25c",\r
+    "id": "9670670b.649c48",\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": 4168.5001220703125,\r
-    "y": 1319,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4191.383453369141,\r
+    "y": 1334.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7a559df8.2fbb14",\r
+    "id": "bc752416.e0cbc",\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": 4179.5001220703125,\r
-    "y": 1264,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4202.383453369141,\r
+    "y": 1279.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cac46a50.7c9a2",\r
+    "id": "ab759fb6.dae2a8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4163.8824462890625,\r
-    "y": 1203.6556701660156,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4186.765777587891,\r
+    "y": 1219.5390014648438,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "66f1613b.919fb"\r
+        "fbc120c8.3124d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "66f1613b.919fb",\r
+    "id": "fbc120c8.3124d8",\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": 4348,\r
-    "y": 1218,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4370.883331298828,\r
+    "y": 1233.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "c85b648c.95d8c8"\r
+        "df89787f.a5a578"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c34e936c.c687c",\r
+    "id": "ad8d4f98.026b1",\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": 4515,\r
-    "y": 1404,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4537.883331298828,\r
+    "y": 1419.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bdb7c671.344b18",\r
+    "id": "14c7dbb3.7bb934",\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": 4516,\r
-    "y": 1512,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4538.883331298828,\r
+    "y": 1527.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c2c86af0.87457",\r
+    "id": "832f55b4.d525f",\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": 4517,\r
-    "y": 1461,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4539.883331298828,\r
+    "y": 1476.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4a081ef3.a11e7",\r
+    "id": "9aafd9b7.eaf6",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4539.1171875,\r
-    "y": 1778.34033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4562.000518798828,\r
+    "y": 1794.2236633300781,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "feabfc8a.6835d8",\r
-        "3ad150ae.9686d8",\r
-        "7f60aea1.758cf8"\r
+        "f4bf2a88.8e07c8",\r
+        "84226d1d.c53f58",\r
+        "5135c34e.c2878c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "feabfc8a.6835d8",\r
+    "id": "f4bf2a88.8e07c8",\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": 4754.1171875,\r
-    "y": 1740.34033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4777.000518798828,\r
+    "y": 1756.2236633300781,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3ad150ae.9686d8",\r
+    "id": "84226d1d.c53f58",\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": 4751.1171875,\r
-    "y": 1779.34033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4774.000518798828,\r
+    "y": 1795.2236633300781,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "ee0e6ba7.1ab528"\r
+        "9d44e19c.6d7318"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f60aea1.758cf8",\r
+    "id": "5135c34e.c2878c",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4706.6171875,\r
-    "y": 1821.34033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4729.500518798828,\r
+    "y": 1837.2236633300781,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ee0e6ba7.1ab528",\r
+    "id": "9d44e19c.6d7318",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4931.6171875,\r
-    "y": 1778.34033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4954.500518798828,\r
+    "y": 1794.2236633300781,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f1c6f75a.7a676"\r
+        "29687f0b.c77f5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3cd8e203.e194b6",\r
+    "id": "a2ec001d.4a7fb8",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4746,\r
-    "y": 1222,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4768.883331298828,\r
+    "y": 1237.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "17b6f38.a7a3d8d"\r
+        "6f5c9a68.97563c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "17b6f38.a7a3d8d",\r
+    "id": "6f5c9a68.97563c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4923,\r
-    "y": 1214,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4945.883331298828,\r
+    "y": 1229.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "676933bd.3d8274",\r
-        "263106c3.f9fd42"\r
+        "7ae681af.873ac8",\r
+        "9549ff73.9a1cc8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c85b648c.95d8c8",\r
+    "id": "df89787f.a5a578",\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": 4543,\r
-    "y": 1218,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4565.883331298828,\r
+    "y": 1233.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "3cd8e203.e194b6",\r
-        "a370dab4.6f2d18"\r
+        "a2ec001d.4a7fb8",\r
+        "bc76afd9.40381"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a370dab4.6f2d18",\r
+    "id": "bc76afd9.40381",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4749,\r
-    "y": 1296,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4771.883331298828,\r
+    "y": 1311.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "9dd5a5f0.afd2"\r
+        "1ac8b93a.8f9647"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9dd5a5f0.afd2",\r
+    "id": "1ac8b93a.8f9647",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4926,\r
-    "y": 1288,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4948.883331298828,\r
+    "y": 1303.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "fbf0fc4a.17b5c8"\r
+        "12ac39b2.69f38e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f1c6f75a.7a676",\r
+    "id": "29687f0b.c77f5",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5089.6171875,\r
-    "y": 1778.34033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5112.500518798828,\r
+    "y": 1794.2236633300781,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "3b33bb0c.f032cc"\r
+        "6aef1ca3.67a3dc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3b33bb0c.f032cc",\r
+    "id": "6aef1ca3.67a3dc",\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": 5296.6171875,\r
-    "y": 1778.34033203125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5319.500518798828,\r
+    "y": 1794.2236633300781,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "263106c3.f9fd42",\r
+    "id": "9549ff73.9a1cc8",\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": 5131,\r
-    "y": 1221,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5153.883331298828,\r
+    "y": 1236.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "ddcc8888.29b548",\r
-        "db7fdb45.821a78",\r
-        "ff56d5.bfda3928"\r
+        "1ca68d2c.42a1b3",\r
+        "79238f45.d528a",\r
+        "b580a25b.41384"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "676933bd.3d8274",\r
+    "id": "7ae681af.873ac8",\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": 5161,\r
-    "y": 1169,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5183.883331298828,\r
+    "y": 1184.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ddcc8888.29b548",\r
+    "id": "1ca68d2c.42a1b3",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5341,\r
-    "y": 1212,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5363.883331298828,\r
+    "y": 1227.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e7e5466f.7658a"\r
+        "1cf65ad.e3b2e25"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "db7fdb45.821a78",\r
+    "id": "79238f45.d528a",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5333,\r
-    "y": 1267,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5355.883331298828,\r
+    "y": 1282.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "1793a855.2047c"\r
+        "55debd4.7dcf144"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ff56d5.bfda3928",\r
+    "id": "b580a25b.41384",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5338,\r
-    "y": 1324,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5360.883331298828,\r
+    "y": 1339.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "81dadd48.c741d8"\r
+        "277b43ae.d3d8bc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "81dadd48.c741d8",\r
+    "id": "277b43ae.d3d8bc",\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": 5490,\r
-    "y": 1325,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5512.883331298828,\r
+    "y": 1340.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1793a855.2047c",\r
+    "id": "55debd4.7dcf144",\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": 5501,\r
-    "y": 1270,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5523.883331298828,\r
+    "y": 1285.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e7e5466f.7658a",\r
+    "id": "1cf65ad.e3b2e25",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5485.38232421875,\r
-    "y": 1209.6556701660156,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5508.265655517578,\r
+    "y": 1225.5390014648438,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "dde9f23c.0ef22"\r
+        "293b0137.5d1d8e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fbf0fc4a.17b5c8",\r
+    "id": "12ac39b2.69f38e",\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": 5161,\r
-    "y": 1412,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5183.883331298828,\r
+    "y": 1427.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dde9f23c.0ef22",\r
+    "id": "293b0137.5d1d8e",\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": 5700,\r
-    "y": 1206,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5722.883331298828,\r
+    "y": 1221.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f4910610.e101b8",\r
+    "id": "f12c4ac3.acc2d",\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": 4284,\r
-    "y": 860,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4306.883331298828,\r
+    "y": 875.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f3cd87cd.165138",\r
+    "id": "23d5a8e8.6a48d8",\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": 4275,\r
-    "y": 958,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4297.883331298828,\r
+    "y": 973.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e77feac5.4ef39",\r
+    "id": "52465f0e.0c996",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4109,\r
-    "y": 866,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4131.883331298828,\r
+    "y": 881.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "985f8e8b.05bee8",\r
-        "f4910610.e101b8"\r
+        "c68d1d99.71ec4",\r
+        "f12c4ac3.acc2d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dc5de667.94277",\r
+    "id": "98cbb890.5e8b88",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4115,\r
-    "y": 930,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4137.883331298828,\r
+    "y": 945.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f70bc04c.4e53a8",\r
-        "f3cd87cd.165138"\r
+        "97074ecd.08e3c8",\r
+        "23d5a8e8.6a48d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "79d85b32.4dba8c",\r
+    "id": "d0104e32.ac2ab8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4115,\r
-    "y": 1036,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4137.883331298828,\r
+    "y": 1051.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "279fdf30.7efb5",\r
-        "746b1d51.0e2bec"\r
+        "be8be686.f85c68",\r
+        "e50dfba7.f60328"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5799e4b6.bb5c84",\r
+    "id": "8e259d5c.262c5",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4118,\r
-    "y": 1089,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4140.883331298828,\r
+    "y": 1104.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "59ab7a89.d7cd04",\r
-        "b63e0082.68a46"\r
+        "3fa3de22.b5b33a",\r
+        "6c2da806.3569b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "746b1d51.0e2bec",\r
+    "id": "e50dfba7.f60328",\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": 4275,\r
-    "y": 1049,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4297.883331298828,\r
+    "y": 1064.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b63e0082.68a46",\r
+    "id": "6c2da806.3569b",\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": 4278,\r
-    "y": 1140,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4300.883331298828,\r
+    "y": 1155.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "87a4f79d.f1b41",\r
+    "id": "b9324a20.74a63",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3650,\r
-    "y": 2350,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3672.883331298828,\r
+    "y": 2365.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "8613884a.623e8",\r
-        "df0137f0.20c7a8"\r
+        "f10be91.1b09d98",\r
+        "d09bd461.c7ba88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af9ecc7.c2e763",\r
+    "id": "56bce95e.90bfe",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3477.33349609375,\r
-    "y": 2351,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3500.216827392578,\r
+    "y": 2366.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "87a4f79d.f1b41"\r
+        "b9324a20.74a63"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "53f2a3cf.4dd8a4",\r
+    "id": "aea1bf99.8fdcc",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3486.824462890625,\r
-    "y": 2393.5740356445312,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3509.707794189453,\r
+    "y": 2409.4573669433594,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "50bbbd16.7373fc"\r
+        "29a46b5c.88b5bc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "aba66972.a33e38",\r
+    "id": "87e0206.8796c6",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3475.33349609375,\r
-    "y": 2440,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3498.216827392578,\r
+    "y": 2455.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "6c045770.56d3d"\r
+        "1d955e57.2601ca"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "50bbbd16.7373fc",\r
+    "id": "29a46b5c.88b5bc",\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": 3640.3958740234375,\r
-    "y": 2396.8597717285156,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3663.2792053222656,\r
+    "y": 2412.7431030273438,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6c045770.56d3d",\r
+    "id": "1d955e57.2601ca",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3644.33349609375,\r
-    "y": 2441,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3667.216827392578,\r
+    "y": 2456.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8613884a.623e8",\r
+    "id": "f10be91.1b09d98",\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": 3936.33349609375,\r
-    "y": 2354.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3959.216827392578,\r
+    "y": 2369.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "d23083de.2cf1e",\r
-        "7516fca6.f7fc04"\r
+        "fda7c536.3acee",\r
+        "c79b96a2.97ef58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7516fca6.f7fc04",\r
+    "id": "c79b96a2.97ef58",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4159.33349609375,\r
-    "y": 2309.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4182.216827392578,\r
+    "y": 2324.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "c66357b4.73185"\r
+        "81ad908f.6a16e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d23083de.2cf1e",\r
+    "id": "fda7c536.3acee",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4161.33349609375,\r
-    "y": 2373.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4184.216827392578,\r
+    "y": 2388.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "a82df7d1.ae6a"\r
+        "e8b14d91.9e5c88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a82df7d1.ae6a",\r
+    "id": "e8b14d91.9e5c88",\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": 4320.33349609375,\r
-    "y": 2392.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4343.216827392578,\r
+    "y": 2407.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c66357b4.73185",\r
+    "id": "81ad908f.6a16e",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4324.33349609375,\r
-    "y": 2306.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4347.216827392578,\r
+    "y": 2321.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "dffb0ed6.823ba",\r
-        "1dd3dd1b.7300fb"\r
+        "cad9326b.b2da",\r
+        "3eb5f127.732d1e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "634f24c.033d45c",\r
+    "id": "cf8b334d.12d69",\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": 3938.33349609375,\r
-    "y": 2513.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3961.216827392578,\r
+    "y": 2528.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "165310c1.3dcf57",\r
+    "id": "a51bfc6c.2ab4b",\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": 3983.33349609375,\r
-    "y": 2423.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4006.216827392578,\r
+    "y": 2438.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1c4663ba.666f24",\r
+    "id": "5d70457e.e444e4",\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": 4065.33349609375,\r
-    "y": 2578.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4088.216827392578,\r
+    "y": 2593.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6481b806.b26798",\r
+    "id": "ff1965cc.9c6318",\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": 3249.33349609375,\r
-    "y": 2386,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3272.216827392578,\r
+    "y": 2401.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "af9ecc7.c2e763",\r
-        "53f2a3cf.4dd8a4",\r
-        "aba66972.a33e38"\r
+        "56bce95e.90bfe",\r
+        "aea1bf99.8fdcc",\r
+        "87e0206.8796c6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "357b021d.ccef76",\r
+    "id": "e04ad761.fdc11",\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": 3210.33349609375,\r
-    "y": 2330,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3233.216827392578,\r
+    "y": 2345.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d2628754.9207b8",\r
+    "id": "3d22a200.42e29e",\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": 3267.33349609375,\r
-    "y": 2048.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3290.216827392578,\r
+    "y": 2064.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f940533a.3599b",\r
-        "b0b7c077.9433c"\r
+        "f0778891.f400f",\r
+        "2be980fe.83d6b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b0b7c077.9433c",\r
+    "id": "2be980fe.83d6b8",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3490.33349609375,\r
-    "y": 2034.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3513.216827392578,\r
+    "y": 2050.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "c06f7f13.a06918"\r
+        "1ec9f8d.bab6807"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f940533a.3599b",\r
+    "id": "f0778891.f400f",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3492.33349609375,\r
-    "y": 2067.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3515.216827392578,\r
+    "y": 2083.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "1b16d50a.3ac5a3"\r
+        "45edb459.c45c8c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1b16d50a.3ac5a3",\r
+    "id": "45edb459.c45c8c",\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": 3635.33349609375,\r
-    "y": 2064.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3658.216827392578,\r
+    "y": 2080.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c06f7f13.a06918",\r
+    "id": "1ec9f8d.bab6807",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3638.33349609375,\r
-    "y": 2027.9998779296875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3661.216827392578,\r
+    "y": 2043.8832092285156,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f576457.60ef6b8",\r
-        "57336dca.385a1c"\r
+        "8bf99b8b.4af368",\r
+        "57c842ba.83379c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f576457.60ef6b8",\r
+    "id": "8bf99b8b.4af368",\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": 3832.33349609375,\r
-    "y": 2031,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3855.216827392578,\r
+    "y": 2046.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "df0137f0.20c7a8",\r
+    "id": "d09bd461.c7ba88",\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": 3895.33349609375,\r
-    "y": 2663,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3918.216827392578,\r
+    "y": 2678.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e2836384.c2ccb8"\r
+        "adbd165.7c69a68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e2836384.c2ccb8",\r
+    "id": "adbd165.7c69a68",\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": 4101.33349609375,\r
-    "y": 2663,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4124.216827392578,\r
+    "y": 2678.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "fca69a38.03a91"\r
+        "9b58a38.dc3806"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fca69a38.03a91",\r
+    "id": "9b58a38.dc3806",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4318.619140625,\r
-    "y": 2661.82177734375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4341.502471923828,\r
+    "y": 2677.705108642578,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "7ea58eaa.2fe4c8"\r
+        "ec0e6199.3c529"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "57336dca.385a1c",\r
+    "id": "57c842ba.83379c",\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": 3854.33349609375,\r
-    "y": 2099,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3877.216827392578,\r
+    "y": 2114.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "4f2611a4.8dfaa",\r
-        "d01e89f4.899b8",\r
-        "4dbe2024.2418c8"\r
+        "34626e8a.0bbe1a",\r
+        "390dcffe.f00898",\r
+        "4d1fe4fe.2890ec"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4f2611a4.8dfaa",\r
+    "id": "34626e8a.0bbe1a",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4049.8336181640625,\r
-    "y": 2051,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4072.7169494628906,\r
+    "y": 2066.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "c7fe21e9.219fb"\r
+        "95be6ff8.bea0e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d01e89f4.899b8",\r
+    "id": "390dcffe.f00898",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4041.8336181640625,\r
-    "y": 2106,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4064.7169494628906,\r
+    "y": 2121.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "711f5b9.04549a4"\r
+        "46312f08.59959"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4dbe2024.2418c8",\r
+    "id": "4d1fe4fe.2890ec",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4046.8336181640625,\r
-    "y": 2163,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4069.7169494628906,\r
+    "y": 2178.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "7a110b6a.211174"\r
+        "15450853.01aa88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7a110b6a.211174",\r
+    "id": "15450853.01aa88",\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": 4198.8336181640625,\r
-    "y": 2164,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4221.716949462891,\r
+    "y": 2179.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "711f5b9.04549a4",\r
+    "id": "46312f08.59959",\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": 4209.8336181640625,\r
-    "y": 2109,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4232.716949462891,\r
+    "y": 2124.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c7fe21e9.219fb",\r
+    "id": "95be6ff8.bea0e",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4194.2159423828125,\r
-    "y": 2048.6556701660156,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4217.099273681641,\r
+    "y": 2064.5390014648438,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "5f7a4387.8903dc"\r
+        "691678af.c2875"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dffb0ed6.823ba",\r
+    "id": "cad9326b.b2da",\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": 4494.33349609375,\r
-    "y": 2267.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4517.216827392578,\r
+    "y": 2282.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1dd3dd1b.7300fb",\r
+    "id": "3eb5f127.732d1e",\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": 4495.33349609375,\r
-    "y": 2372.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4518.216827392578,\r
+    "y": 2387.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "132cb9b4.8d2256",\r
+    "id": "bf01d807.ca2a6",\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": 4490.33349609375,\r
-    "y": 2321.0001220703125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4513.216827392578,\r
+    "y": 2336.8834533691406,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7ea58eaa.2fe4c8",\r
+    "id": "ec0e6199.3c529",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4525.45068359375,\r
-    "y": 2651.3404541015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4548.334014892578,\r
+    "y": 2667.2237854003906,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "9217eff0.7fa96",\r
-        "965ae906.eae45",\r
-        "1b19b6f0.8ece39"\r
+        "310c30a2.98cdd8",\r
+        "f852afcd.3e249",\r
+        "77117052.72541"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9217eff0.7fa96",\r
+    "id": "310c30a2.98cdd8",\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": 4740.45068359375,\r
-    "y": 2613.3404541015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4763.334014892578,\r
+    "y": 2629.2237854003906,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "965ae906.eae45",\r
+    "id": "f852afcd.3e249",\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": 4737.45068359375,\r
-    "y": 2652.3404541015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4760.334014892578,\r
+    "y": 2668.2237854003906,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "87f8942.95038e8"\r
+        "8dd58be1.de6918"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1b19b6f0.8ece39",\r
+    "id": "77117052.72541",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4692.95068359375,\r
-    "y": 2694.3404541015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4715.834014892578,\r
+    "y": 2710.2237854003906,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "87f8942.95038e8",\r
+    "id": "8dd58be1.de6918",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4917.95068359375,\r
-    "y": 2651.3404541015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4940.834014892578,\r
+    "y": 2667.2237854003906,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "65d1ff2e.3f2e18"\r
+        "bf6de4b9.07a8d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "65d1ff2e.3f2e18",\r
+    "id": "bf6de4b9.07a8d8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5075.95068359375,\r
-    "y": 2651.3404541015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5098.834014892578,\r
+    "y": 2667.2237854003906,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "fedf1a96.f1456"\r
+        "4337b0b8.5fd258"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fedf1a96.f1456",\r
+    "id": "4337b0b8.5fd258",\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": 5282.95068359375,\r
-    "y": 2651.3404541015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5305.834014892578,\r
+    "y": 2667.2237854003906,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "115bab50.32a055",\r
+    "id": "290c1291.0be836",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4776.33349609375,\r
-    "y": 2067,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4799.216827392578,\r
+    "y": 2082.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e64c3553.0ae97"\r
+        "4a42d224.6e916c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e64c3553.0ae97",\r
+    "id": "4a42d224.6e916c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4953.33349609375,\r
-    "y": 2059,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4976.216827392578,\r
+    "y": 2074.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "a2d6f837.6f757",\r
-        "eeac3b28.315368"\r
+        "44500a36.8314c4",\r
+        "edf4775.6feec88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5f7a4387.8903dc",\r
+    "id": "691678af.c2875",\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": 4378.33349609375,\r
-    "y": 2063,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4401.216827392578,\r
+    "y": 2078.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "bd77f52.650d108"\r
+        "e26ac43.7b22838"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bd77f52.650d108",\r
+    "id": "e26ac43.7b22838",\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": 4573.33349609375,\r
-    "y": 2063,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4596.216827392578,\r
+    "y": 2078.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "115bab50.32a055",\r
-        "c1dba387.605d3"\r
+        "290c1291.0be836",\r
+        "91efe90a.a989f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eeac3b28.315368",\r
+    "id": "edf4775.6feec88",\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": 5161.33349609375,\r
-    "y": 2066,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5184.216827392578,\r
+    "y": 2081.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "fa5ccc46.c0c8e8",\r
-        "7f544ab3.a923ac",\r
-        "629c31b0.bf54b"\r
+        "ccc8d651.608a58",\r
+        "4c1a6f18.7cad4",\r
+        "d7a69532.21f81"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3e060ac3.b125d6",\r
+    "id": "1e83e9df.5f1ca6",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4955.33349609375,\r
-    "y": 2132,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4978.216827392578,\r
+    "y": 2147.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "a8b3b7de.4e882"\r
+        "36af6584.4e4842"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c1dba387.605d3",\r
+    "id": "91efe90a.a989f",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4778.33349609375,\r
-    "y": 2140,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4801.216827392578,\r
+    "y": 2155.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "3e060ac3.b125d6"\r
+        "1e83e9df.5f1ca6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a2d6f837.6f757",\r
+    "id": "44500a36.8314c4",\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": 5191.33349609375,\r
-    "y": 2014,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5214.216827392578,\r
+    "y": 2029.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a8b3b7de.4e882",\r
+    "id": "36af6584.4e4842",\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": 5190.33349609375,\r
-    "y": 2256,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5213.216827392578,\r
+    "y": 2271.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fa5ccc46.c0c8e8",\r
+    "id": "ccc8d651.608a58",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5371.33349609375,\r
-    "y": 2057,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5394.216827392578,\r
+    "y": 2072.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "58f99424.7527f4"\r
+        "39681472.975784"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f544ab3.a923ac",\r
+    "id": "4c1a6f18.7cad4",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5363.33349609375,\r
-    "y": 2112,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5386.216827392578,\r
+    "y": 2127.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "ffe0cce7.8e8ca"\r
+        "bc7c4cb6.e261e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "629c31b0.bf54b",\r
+    "id": "d7a69532.21f81",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5368.33349609375,\r
-    "y": 2169,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5391.216827392578,\r
+    "y": 2184.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "cc8477b8.611dc8"\r
+        "10a038dd.f22947"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cc8477b8.611dc8",\r
+    "id": "10a038dd.f22947",\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": 5520.33349609375,\r
-    "y": 2170,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5543.216827392578,\r
+    "y": 2185.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ffe0cce7.8e8ca",\r
+    "id": "bc7c4cb6.e261e8",\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": 5531.33349609375,\r
-    "y": 2115,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5554.216827392578,\r
+    "y": 2130.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "58f99424.7527f4",\r
+    "id": "39681472.975784",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5515.7158203125,\r
-    "y": 2054.6556701660156,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5538.599151611328,\r
+    "y": 2070.5390014648438,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f5242e64.71f82"\r
+        "19f3508c.df2467"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5242e64.71f82",\r
+    "id": "19f3508c.df2467",\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": 5730.33349609375,\r
-    "y": 2051,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5753.216827392578,\r
+    "y": 2066.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "20bb7eae.be3a32",\r
+    "id": "a8011cb7.dd8288",\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
+    "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3229,\r
-    "y": 1661,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3251.883331298828,\r
+    "y": 1676.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7762f3ae.52a254",\r
+    "id": "48c20a24.e1d944",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4451,\r
-    "y": 944,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4473.883331298828,\r
+    "y": 959.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "edff520.fc6aeb",\r
+    "id": "33f8c668.c00922",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4443,\r
-    "y": 1034,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4465.883331298828,\r
+    "y": 1049.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9fcb0922.e08ed",\r
+    "id": "60be6b60.c49e7c",\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
+    "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3210,\r
-    "y": 2517,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3232.883331298828,\r
+    "y": 2532.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3db2acf8.6fe83c",\r
+    "id": "77fe2bdc.eed0c4",\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": 3361,\r
-    "y": 2765,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3383.883331298828,\r
+    "y": 2780.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d8a34ec.a6346b",\r
+    "id": "c658e7ef.0b11d8",\r
     "type": "switchNode",\r
     "name": "switch found-middle-man?",\r
     "xml": "<switch test='`$found-middle-man`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3238,\r
-    "y": 2875,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3260.883331298828,\r
+    "y": 2890.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "52347f79.8db4f",\r
-        "cd09ff82.d8b0a8"\r
+        "5eb047e9.2f7668",\r
+        "a0bb1c61.b88728"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "52347f79.8db4f",\r
+    "id": "5eb047e9.2f7668",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3422,\r
-    "y": 2854,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3444.883331298828,\r
+    "y": 2869.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "2a86c6f9.428e32"\r
+        "fb1841e2.6264"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cd09ff82.d8b0a8",\r
+    "id": "a0bb1c61.b88728",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3314,\r
-    "y": 5032,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3336.883331298828,\r
+    "y": 5047.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "36762610.1073d2"\r
+        "4d88182e.2579a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "36762610.1073d2",\r
+    "id": "4d88182e.2579a",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3469,\r
-    "y": 5025,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3491.883331298828,\r
+    "y": 5040.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "ae52f9b0.eb7378",\r
-        "6bdb71eb.cd7da",\r
-        "5ba113f8.d2a564",\r
-        "536ae5e9.b25a04",\r
-        "5c19cae5.23f224"\r
+        "44d48088.590d78",\r
+        "a2dd9c19.75287",\r
+        "906b118c.b5ca4",\r
+        "80cc4c1e.a6bfe",\r
+        "3d1de5ec.2ac45a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2a86c6f9.428e32",\r
+    "id": "fb1841e2.6264",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3565,\r
-    "y": 2854,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3587.883331298828,\r
+    "y": 2869.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "60b7b56f.adea4c",\r
-        "bdc41b3b.e9f9e8",\r
-        "9a7dac44.d03ca8",\r
-        "bedde447.35d04",\r
-        "7fc21231.2a386c",\r
-        "541e3cf1.3cdc4c",\r
-        "8e19f306.cd166",\r
-        "7aa2001.036a58",\r
-        "fd1584d2.77bd18",\r
-        "4d65e0ad.f66548",\r
-        "799454e3.25827c",\r
-        "ca44c46f.688fa8",\r
-        "3e5313a9.d78034",\r
-        "3f9a9e6f.0fc392",\r
-        "f035278d.c09ef",\r
-        "c934426f.9b2fb",\r
-        "a387df7d.b7b76",\r
-        "944ed400.3d2108",\r
-        "e04ee2dc.c84258"\r
+        "e6eab534.0772a8",\r
+        "b10b9835.71fc5",\r
+        "9c84ab4f.a1a008",\r
+        "50925bce.958aec",\r
+        "eab645cb.c973",\r
+        "74310cc1.794b3c",\r
+        "b442de01.03d108",\r
+        "a559e6ec.97fea8",\r
+        "c65cb0db.1db578",\r
+        "c0792f26.4d13b8",\r
+        "e82ea719.e6f068",\r
+        "c4a1bace.0d4bb",\r
+        "8f561f42.000fe8",\r
+        "aa738c85.1c137",\r
+        "54d18bcb.0986c4",\r
+        "4494cc45.3ce764",\r
+        "b937ed07.a77618",\r
+        "d5c180c8.9f0b08",\r
+        "123d53b6.2c62dc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fd1584d2.77bd18",\r
+    "id": "c65cb0db.1db578",\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": 3876,\r
-    "y": 3209,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3898.883331298828,\r
+    "y": 3224.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "60b7b56f.adea4c",\r
+    "id": "e6eab534.0772a8",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3830,\r
-    "y": 3307,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3852.883331298828,\r
+    "y": 3322.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bdc41b3b.e9f9e8",\r
+    "id": "b10b9835.71fc5",\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": 3966,\r
-    "y": 3354,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3988.883331298828,\r
+    "y": 3369.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "335c026d.7b6e86",\r
+    "id": "6e8e8040.0d64",\r
     "type": "comment",\r
     "name": "Create ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3797,\r
-    "y": 3158,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3819.883331298828,\r
+    "y": 3173.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "15801117.33a03f",\r
+    "id": "69147836.dfe478",\r
     "type": "comment",\r
     "name": "create middle man connectivity and ...",\r
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",\r
     "comments": "",\r
-    "x": 4323,\r
-    "y": 3649,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4345.883331298828,\r
+    "y": 3664.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9a7dac44.d03ca8",\r
+    "id": "9c84ab4f.a1a008",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity middle-man",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3887,\r
-    "y": 3688,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3909.883331298828,\r
+    "y": 3703.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bedde447.35d04",\r
+    "id": "50925bce.958aec",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3835,\r
-    "y": 3739,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3857.883331298828,\r
+    "y": 3754.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7fc21231.2a386c",\r
+    "id": "eab645cb.c973",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3971,\r
-    "y": 3786,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3993.883331298828,\r
+    "y": 3801.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9c57f099.e1906",\r
+    "id": "921a5ccf.2b2f38",\r
     "type": "comment",\r
     "name": "Create MIDDLE-MAN connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3828,\r
-    "y": 3648,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3850.883331298828,\r
+    "y": 3663.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c4862f6c.a2a29",\r
+    "id": "8fa15646.014b68",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4258,\r
-    "y": 3845,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4280.883331298828,\r
+    "y": 3860.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "541e3cf1.3cdc4c",\r
+    "id": "74310cc1.794b3c",\r
     "type": "save",\r
     "name": "get middle-man connectivity from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3849,\r
-    "y": 3892,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3871.883331298828,\r
+    "y": 3907.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "42cf0b77.2dec84",\r
-        "81ea64e.302c518",\r
-        "1a138015.57b74"\r
+        "9785079b.24c0f8",\r
+        "81e9c000.43765",\r
+        "377b8f18.e7499"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "42cf0b77.2dec84",\r
+    "id": "9785079b.24c0f8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4096,\r
-    "y": 3846,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4118.883331298828,\r
+    "y": 3861.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "c4862f6c.a2a29"\r
+        "8fa15646.014b68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "81ea64e.302c518",\r
+    "id": "81e9c000.43765",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4096.490966796875,\r
-    "y": 3891.5740356445312,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4119.374298095703,\r
+    "y": 3907.4573669433594,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "396ed743.e6ca6"\r
+        "b389b203.4af2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1a138015.57b74",\r
+    "id": "377b8f18.e7499",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4094,\r
-    "y": 3935,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4116.883331298828,\r
+    "y": 3950.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f5385619.47f03"\r
+        "7f887f7.029e08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "396ed743.e6ca6",\r
+    "id": "b389b203.4af2",\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": 4259.0623779296875,\r
-    "y": 3891.8597717285156,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4281.945709228516,\r
+    "y": 3907.7431030273438,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f5385619.47f03",\r
+    "id": "7f887f7.029e08",\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": 4263,\r
-    "y": 3936,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4285.883331298828,\r
+    "y": 3951.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f035278d.c09ef",\r
+    "id": "54d18bcb.0986c4",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3906,\r
-    "y": 4171,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3928.883331298828,\r
+    "y": 4186.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c934426f.9b2fb",\r
+    "id": "4494cc45.3ce764",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3909,\r
-    "y": 4216,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3931.883331298828,\r
+    "y": 4231.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "944ed400.3d2108",\r
+    "id": "d5c180c8.9f0b08",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3898,\r
-    "y": 4007,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3920.883331298828,\r
+    "y": 4022.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e04ee2dc.c84258",\r
+    "id": "123d53b6.2c62dc",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3900,\r
-    "y": 4054,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3922.883331298828,\r
+    "y": 4069.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "49a17204.cabfec",\r
+    "id": "8369bd06.57f78",\r
     "type": "comment",\r
     "name": "The following two will be done in F1",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3822,\r
-    "y": 4124,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3844.883331298828,\r
+    "y": 4139.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f9147a44.abd5d",\r
+    "id": "487123e4.9cc8ac",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4429,\r
-    "y": 4853,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4451.883331298828,\r
+    "y": 4868.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ae52f9b0.eb7378",\r
+    "id": "44d48088.590d78",\r
     "type": "switchNode",\r
     "name": "switch no-pce-call",\r
     "xml": "<switch test='`$no-pce-call`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3684,\r
-    "y": 5006,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3706.883331298828,\r
+    "y": 5021.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "2031568b.5c466a",\r
-        "d5c3bda4.9d44d"\r
+        "876b39f.35a52c8",\r
+        "8bc7cacf.04871"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d5c3bda4.9d44d",\r
+    "id": "8bc7cacf.04871",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3856,\r
-    "y": 5003,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3878.883331298828,\r
+    "y": 5018.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "3fb1d79b.8d6fb8"\r
+        "682f4705.be7878"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2031568b.5c466a",\r
+    "id": "876b39f.35a52c8",\r
     "type": "outcomeFalse",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3808,\r
-    "y": 5850,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3830.883331298828,\r
+    "y": 5865.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "ff5eb6bb.d3898"\r
+        "dd90ad1a.7eef1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "35005760.153d9",\r
+    "id": "270e251f.118d82",\r
     "type": "comment",\r
     "name": "1 --> PCE is needed",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3869,\r
-    "y": 4973,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3891.883331298828,\r
+    "y": 4988.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "53b6adea.273794",\r
+    "id": "4e629c01.10676c",\r
     "type": "comment",\r
     "name": "2 --> no need to call PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3879,\r
-    "y": 5808,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3901.883331298828,\r
+    "y": 5823.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8e19f306.cd166",\r
+    "id": "b442de01.03d108",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3906,\r
-    "y": 4280,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3928.883331298828,\r
+    "y": 4295.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3fb1d79b.8d6fb8",\r
+    "id": "682f4705.be7878",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4032,\r
-    "y": 5005,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4054.883331298828,\r
+    "y": 5020.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "a4f5d754.33c548",\r
-        "77d0a120.a8d4c8",\r
-        "ea3dea31.55403",\r
-        "faf54698.eda79",\r
-        "e80f8be5.03c42",\r
-        "3b266df3.e7977a",\r
-        "f9147a44.abd5d"\r
+        "bf69d5f0.d5943",\r
+        "50051e09.5a44c8",\r
+        "d933fbbc.703308",\r
+        "52cab496.bab24c",\r
+        "86c9672.840f818",\r
+        "81a4b89b.48797",\r
+        "487123e4.9cc8ac"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "30197835.1bf978",\r
+    "id": "b674f25b.3aa2a8",\r
     "type": "comment",\r
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5477,\r
-    "y": 4478,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5499.883331298828,\r
+    "y": 4493.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a4f5d754.33c548",\r
+    "id": "bf69d5f0.d5943",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4424,\r
-    "y": 5156,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4446.883331298828,\r
+    "y": 5171.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "cce2d7d9.b9218",\r
+    "id": "5c84b550.a10344",\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": 3916,\r
-    "y": 4335,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3938.883331298828,\r
+    "y": 4350.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7aa2001.036a58",\r
+    "id": "a559e6ec.97fea8",\r
     "type": "save",\r
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3882,\r
-    "y": 3548,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3904.883331298828,\r
+    "y": 3563.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2d8b9b70.b52efc",\r
+    "id": "ce126dd2.e4e358",\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": 3342,\r
-    "y": 1767,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3364.883331298828,\r
+    "y": 1782.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "26382876.b9a68",\r
+    "id": "b48deb35.d704b8",\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": 3249,\r
-    "y": 1714,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3271.883331298828,\r
+    "y": 1729.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "31c62db7.5b8522",\r
+    "id": "dfa7cbf8.916408",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",\r
     "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",\r
     "comments": "",\r
-    "x": 3932,\r
-    "y": 3251,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3954.883331298828,\r
+    "y": 3266.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4d65e0ad.f66548",\r
+    "id": "c0792f26.4d13b8",\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": 3879,\r
-    "y": 2839,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3901.883331298828,\r
+    "y": 2854.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "799454e3.25827c",\r
+    "id": "e82ea719.e6f068",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3827,\r
-    "y": 2887,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3849.883331298828,\r
+    "y": 2902.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ca44c46f.688fa8",\r
+    "id": "c4a1bace.0d4bb",\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": 3955,\r
-    "y": 2934,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3977.883331298828,\r
+    "y": 2949.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c038b97c.5e298",\r
+    "id": "c598b640.a89e8",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3792,\r
-    "y": 2797,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3814.883331298828,\r
+    "y": 2812.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3e5313a9.d78034",\r
+    "id": "8f561f42.000fe8",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3789,\r
-    "y": 3025,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3811.883331298828,\r
+    "y": 3040.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3f9a9e6f.0fc392",\r
+    "id": "aa738c85.1c137",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3882,\r
-    "y": 3078,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3904.883331298828,\r
+    "y": 3093.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "281fc4fa.e1a84c",\r
+    "id": "b51a7f91.5cff9",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3773,\r
-    "y": 2981,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3795.883331298828,\r
+    "y": 2996.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9dc1c6e1.2dba4",\r
+    "id": "4ec3384a.676a5",\r
     "type": "comment",\r
     "name": "Create ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3779,\r
-    "y": 3431,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3801.883331298828,\r
+    "y": 3446.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "faf54698.eda79",\r
+    "id": "52cab496.bab24c",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4346,\r
-    "y": 4486,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4368.883331298828,\r
+    "y": 4501.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "eb955021.5749d",\r
+    "id": "1646f155.836fb7",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4330,\r
-    "y": 4442,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4352.883331298828,\r
+    "y": 4457.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b9a6d392.b28d6",\r
+    "id": "778ce84a.a3568",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5077,\r
-    "y": 4473,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5099.883331298828,\r
+    "y": 4488.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bed8a2a5.609b9",\r
+    "id": "b61f10f5.eeecf",\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": 5164,\r
-    "y": 4515,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5186.883331298828,\r
+    "y": 4530.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bbe5119a.b6b9a",\r
+    "id": "90640d99.12302",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5112,\r
-    "y": 4563,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5134.883331298828,\r
+    "y": 4578.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2aa44f99.3f02c8",\r
+    "id": "42e8372d.d506e",\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": 5240,\r
-    "y": 4610,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5262.883331298828,\r
+    "y": 4625.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3b266df3.e7977a",\r
+    "id": "81a4b89b.48797",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4417,\r
-    "y": 4895,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4439.883331298828,\r
+    "y": 4910.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bd185a34.34e6a8",\r
+    "id": "a53bc0fc.34d448",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4400,\r
-    "y": 4957,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4422.883331298828,\r
+    "y": 4972.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "77d0a120.a8d4c8",\r
+    "id": "50051e09.5a44c8",\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": 4511,\r
-    "y": 4999,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4533.883331298828,\r
+    "y": 5014.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "915b754b.45601",\r
+    "id": "3073b323.349b7c",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4959,\r
-    "y": 5052,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4981.883331298828,\r
+    "y": 5067.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8cb093f8.38739",\r
+    "id": "dbdd7c00.c39698",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4269,\r
-    "y": 5750,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4291.883331298828,\r
+    "y": 5765.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "90b420e2.468d1",\r
+    "id": "1d6ec4bb.ad8c0b",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4167,\r
-    "y": 5699,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4189.883331298828,\r
+    "y": 5714.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e890a410.6577f8",\r
+    "id": "41eb9866.4372",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4151,\r
-    "y": 5655,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4173.883331298828,\r
+    "y": 5670.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ca407fe0.a74b58",\r
+    "id": "c54f6272.9ba24",\r
     "type": "save",\r
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4957.999755859375,\r
-    "y": 5853,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4980.883087158203,\r
+    "y": 5868.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ea3dea31.55403",\r
+    "id": "d933fbbc.703308",\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": 4338,\r
-    "y": 5056,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4360.883331298828,\r
+    "y": 5071.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "130129c6.4e6896",\r
-        "c2790bbb.b39ef"\r
+        "4c2996a3.75ee88",\r
+        "d5943bd2.ad1f5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "130129c6.4e6896",\r
+    "id": "4c2996a3.75ee88",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4549,\r
-    "y": 5056,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4571.883331298828,\r
+    "y": 5071.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "b2be4205.132768"\r
+        "8f5805d9.890fd8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b2be4205.132768",\r
+    "id": "8f5805d9.890fd8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4705,\r
-    "y": 5052,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4727.883331298828,\r
+    "y": 5067.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "915b754b.45601",\r
-        "3264661d.b6671a",\r
-        "cf1a8f36.08af8"\r
+        "3073b323.349b7c",\r
+        "7eeebeb3.54b298",\r
+        "eadd33f3.5f43"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c2790bbb.b39ef",\r
+    "id": "d5943bd2.ad1f5",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4545,\r
-    "y": 5104,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4567.883331298828,\r
+    "y": 5119.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "1090c9ed.cf8dde"\r
+        "329fba30.af81ce"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1090c9ed.cf8dde",\r
+    "id": "329fba30.af81ce",\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": 4693,\r
-    "y": 5099,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4715.883331298828,\r
+    "y": 5114.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "53ad7751.2dcd08",\r
+    "id": "7679135b.31e8e4",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5201,\r
-    "y": 4681,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5223.883331298828,\r
+    "y": 4696.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "59db3330.69645c",\r
+    "id": "d050303.0f4a3d",\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": 2367,\r
-    "y": 92,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2389.883331298828,\r
+    "y": 107.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4ebbcee7.69b52",\r
+    "id": "c2f95f80.985fc",\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": 2301,\r
-    "y": 128,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2323.883331298828,\r
+    "y": 143.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4ea5390e.a52cc",\r
+    "id": "360465cd.d1fc3a",\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": 2486,\r
-    "y": 55,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 2508.883331298828,\r
+    "y": 70.88333129882812,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "37299dd0.22785a",\r
+    "id": "33673680.57cf72",\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": 4236,\r
-    "y": 5816,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4258.883331298828,\r
+    "y": 5831.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "606aa5ab.2206bc",\r
+    "id": "e2cec405.b0409",\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": 4369,\r
-    "y": 5864,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4391.883331298828,\r
+    "y": 5879.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "17ac1f1.6d565e1",\r
+    "id": "6e2ab292.566884",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4188,\r
-    "y": 5922,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4210.883331298828,\r
+    "y": 5937.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "7b13241a.22fd54",\r
-        "f9b4895b.fbea48"\r
+        "9073e816.ad482",\r
+        "45d66689.aaaf7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7b13241a.22fd54",\r
+    "id": "9073e816.ad482",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4381,\r
-    "y": 5923,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4403.883331298828,\r
+    "y": 5938.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "827a3a72.ba4bd8"\r
+        "db09f17e.79bb3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "827a3a72.ba4bd8",\r
+    "id": "db09f17e.79bb3",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",\r
     "comments": "",\r
-    "x": 4537,\r
-    "y": 5920,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4559.883331298828,\r
+    "y": 5935.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f9b4895b.fbea48",\r
+    "id": "45d66689.aaaf7",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4385,\r
-    "y": 5967,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4407.883331298828,\r
+    "y": 5982.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "4c414c23.1dfa5c"\r
+        "2adb498f.b3f97e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4c414c23.1dfa5c",\r
+    "id": "2adb498f.b3f97e",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4524,\r
-    "y": 5962,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4546.883331298828,\r
+    "y": 5977.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "ca407fe0.a74b58",\r
-        "87b885a5.5cf0c8",\r
-        "7c94a6cd.50e738",\r
-        "9f0fa012.5d1bf",\r
-        "fafaba2.e8268c8",\r
-        "25a2525f.49399e",\r
-        "593dba4.344bf44",\r
-        "90f4ba85.137fb",\r
-        "52c2d3cf.976804",\r
-        "274ef282.e256ee",\r
-        "eba4a386.8ade58",\r
-        "91ff8ca0.2410d8"\r
+        "c54f6272.9ba24",\r
+        "6998ca1d.92c5d4",\r
+        "15021f96.80eb18",\r
+        "e6e1dbd3.6e0a6",\r
+        "67962261.2516d4",\r
+        "1b601be6.7f6134",\r
+        "27a83227.012ede",\r
+        "b320b0e.20770d",\r
+        "34955381.c5797c",\r
+        "9ca77368.01f7",\r
+        "6922fe88.2fe5f8",\r
+        "4514c9c4.eaef1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "593dba4.344bf44",\r
+    "id": "27a83227.012ede",\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": 4721,\r
-    "y": 6641,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4743.883331298828,\r
+    "y": 6656.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "a83c7fc2.c5da78",\r
-        "914d2791.9def8",\r
-        "a0fd345.ac08f48"\r
+        "c2308ca7.57dff",\r
+        "aeb0b0d0.9dedb8",\r
+        "b67a59a3.18fb1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a83c7fc2.c5da78",\r
+    "id": "c2308ca7.57dff",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4926,\r
-    "y": 6638,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4948.883331298828,\r
+    "y": 6653.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "c1df45ea.8ba52"\r
+        "eeeb2441.6710c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "914d2791.9def8",\r
+    "id": "aeb0b0d0.9dedb8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4909.490966796875,\r
-    "y": 6699.574035644531,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4932.374298095703,\r
+    "y": 6715.457366943359,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "119f1b5d.4e6f5d"\r
+        "77e5496.94ba0b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a0fd345.ac08f48",\r
+    "id": "b67a59a3.18fb1",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4907,\r
-    "y": 6743,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4929.883331298828,\r
+    "y": 6758.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "3791525f.f4d3fe"\r
+        "f70b29bb.3fb788"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c1df45ea.8ba52",\r
+    "id": "eeeb2441.6710c8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5082,\r
-    "y": 6652,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5104.883331298828,\r
+    "y": 6667.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "78ac2a8d.cd0874"\r
+        "a3bf8aa6.020cb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "119f1b5d.4e6f5d",\r
+    "id": "77e5496.94ba0b8",\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": 5072.0623779296875,\r
-    "y": 6699.859771728516,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5094.945709228516,\r
+    "y": 6715.743103027344,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3791525f.f4d3fe",\r
+    "id": "f70b29bb.3fb788",\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": 5074,\r
-    "y": 6742,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5096.883331298828,\r
+    "y": 6757.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "78ac2a8d.cd0874",\r
+    "id": "a3bf8aa6.020cb8",\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": 5329,\r
-    "y": 6649,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5351.883331298828,\r
+    "y": 6664.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "110b3f91.4725e8"\r
+        "8a5692b6.b002c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "110b3f91.4725e8",\r
+    "id": "8a5692b6.b002c8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5566,\r
-    "y": 6645,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5588.883331298828,\r
+    "y": 6660.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e53605cc.b83c3"\r
+        "eabc4609.9defb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cf79f711.acd51",\r
+    "id": "98f388ed.2cda7",\r
     "type": "switchNode",\r
     "name": "switch vpnuuid is for this slice",\r
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5809,\r
-    "y": 6617,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5831.883331298828,\r
+    "y": 6632.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "f8a0a965.9fe23",\r
-        "b32c6358.b77858"\r
+        "6a0ae6a2.ba9fb",\r
+        "25f881ea.6e0566"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f8a0a965.9fe23",\r
+    "id": "6a0ae6a2.ba9fb",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6014,\r
-    "y": 6637,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 6036.883331298828,\r
+    "y": 6652.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "e53605cc.b83c3"\r
+        "eabc4609.9defb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b32c6358.b77858",\r
+    "id": "25f881ea.6e0566",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6013,\r
-    "y": 6590,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 6035.883331298828,\r
+    "y": 6605.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e53605cc.b83c3",\r
+    "id": "eabc4609.9defb",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4757,\r
-    "y": 6912,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4779.883331298828,\r
+    "y": 6927.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "d173aa3d.6dc13"\r
+        "392e3f81.e0a6a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fdc415c8.6a0598",\r
+    "id": "f8de35a7.d0325",\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": 5606,\r
-    "y": 6817,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 6241.88330078125,\r
+    "y": 6865.88330078125,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "37d800ad.83215",\r
+    "id": "8d84ad9.3a159d",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4819,\r
-    "y": 6588,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4841.883331298828,\r
+    "y": 6603.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "25a2525f.49399e",\r
+    "id": "1b601be6.7f6134",\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": 4703,\r
-    "y": 6437,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4725.883331298828,\r
+    "y": 6452.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5323ec48.960894",\r
+    "id": "6e7ae435.b7607c",\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": 5048,\r
-    "y": 6268,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5070.883331298828,\r
+    "y": 6283.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "de0031e3.730958"\r
+        "82ed19a6.aafd78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "de0031e3.730958",\r
+    "id": "82ed19a6.aafd78",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5268,\r
-    "y": 6274,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5290.883331298828,\r
+    "y": 6289.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "2707e8d8.7ec9d"\r
+        "fa1ec726.b4647"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2707e8d8.7ec9d",\r
+    "id": "fa1ec726.b4647",\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": 5453,\r
-    "y": 6273,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5475.883331298828,\r
+    "y": 6288.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "37890125.bbe60e"\r
+        "46306bd4.ee79e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "37890125.bbe60e",\r
+    "id": "46306bd4.ee79e4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5645,\r
-    "y": 6276,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5667.883331298828,\r
+    "y": 6291.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "95332efd.102e7"\r
+        "3b3ddb68.994c3c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "95332efd.102e7",\r
+    "id": "3b3ddb68.994c3c",\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": 5854,\r
-    "y": 6274,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5876.883331298828,\r
+    "y": 6289.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "90f4ba85.137fb",\r
+    "id": "b320b0e.20770d",\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": 4755,\r
-    "y": 6262,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4777.883331298828,\r
+    "y": 6277.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "5323ec48.960894"\r
+        "6e7ae435.b7607c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7c94a6cd.50e738",\r
+    "id": "15021f96.80eb18",\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": 4763,\r
-    "y": 6155,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4785.883331298828,\r
+    "y": 6170.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "b0864a09.98f318",\r
-        "a95b7f6b.2686a",\r
-        "109466fa.601861"\r
+        "90de6696.037bd8",\r
+        "ce29f9bd.7d263",\r
+        "94bbebf0.09f428"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b0864a09.98f318",\r
+    "id": "90de6696.037bd8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4999,\r
-    "y": 6138,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5021.883331298828,\r
+    "y": 6153.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a95b7f6b.2686a",\r
+    "id": "ce29f9bd.7d263",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4996,\r
-    "y": 6179,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5018.883331298828,\r
+    "y": 6194.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "109466fa.601861",\r
+    "id": "94bbebf0.09f428",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5010,\r
-    "y": 6219,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5032.883331298828,\r
+    "y": 6234.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9f0fa012.5d1bf",\r
+    "id": "e6e1dbd3.6e0a6",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
     "comments": "",\r
-    "x": 4699,\r
-    "y": 6314,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4721.883331298828,\r
+    "y": 6329.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fafaba2.e8268c8",\r
+    "id": "67962261.2516d4",\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": 4707,\r
-    "y": 6372,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4729.883331298828,\r
+    "y": 6387.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "87b885a5.5cf0c8",\r
+    "id": "6998ca1d.92c5d4",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
     "comments": "",\r
-    "x": 4712,\r
-    "y": 6112,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4734.883331298828,\r
+    "y": 6127.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "aa72fa33.6435d",\r
+    "id": "94b4d538.041a9",\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": 4827,\r
-    "y": 6064,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4849.883331298828,\r
+    "y": 6079.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d173aa3d.6dc13",\r
+    "id": "392e3f81.e0a6a8",\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": 5000,\r
-    "y": 6909,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5022.883331298828,\r
+    "y": 6924.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "cecd58a1.5c073",\r
-        "a1afbc37.0664b8"\r
+        "84fb2e7.f2e54d",\r
+        "113d3615.17adaa"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cecd58a1.5c073",\r
+    "id": "84fb2e7.f2e54d",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5229,\r
-    "y": 6886,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5251.883331298828,\r
+    "y": 6901.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "217cc28.e6a45be"\r
+        "c3b316fd.fba0a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a1afbc37.0664b8",\r
+    "id": "113d3615.17adaa",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5229,\r
-    "y": 6935,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5251.883331298828,\r
+    "y": 6950.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "217cc28.e6a45be",\r
+    "id": "b6424391.0ceee8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5390,\r
-    "y": 6891,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5984.88330078125,\r
+    "y": 6956.88330078125,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "efcdc93a.a5e52",\r
-        "fdc415c8.6a0598",\r
-        "1d0e63ee.415bac"\r
+        "1cb2d5ed.65008a",\r
+        "f8de35a7.d0325",\r
+        "515cca2b.2a6e8c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3c8e9462.ad4a14",\r
+    "id": "b0305853.25009",\r
     "type": "comment",\r
     "name": "increase the bw of the-vpn-binding and change status to modified",\r
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 5734,\r
-    "y": 6871,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 6369.88330078125,\r
+    "y": 6919.88330078125,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1d0e63ee.415bac",\r
+    "id": "515cca2b.2a6e8c",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5704,\r
-    "y": 6931,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 6339.88330078125,\r
+    "y": 6979.88330078125,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "efcdc93a.a5e52",\r
+    "id": "1cb2d5ed.65008a",\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": 5611,\r
-    "y": 6759,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 6246.88330078125,\r
+    "y": 6807.88330078125,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ff5eb6bb.d3898",\r
+    "id": "dd90ad1a.7eef1",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3960,\r
-    "y": 5849,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3982.883331298828,\r
+    "y": 5864.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "90b420e2.468d1",\r
-        "37299dd0.22785a",\r
-        "606aa5ab.2206bc",\r
-        "17ac1f1.6d565e1",\r
-        "8cb093f8.38739"\r
+        "1d6ec4bb.ad8c0b",\r
+        "33673680.57cf72",\r
+        "e2cec405.b0409",\r
+        "6e2ab292.566884",\r
+        "dbdd7c00.c39698"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "754638fa.2f5ed",\r
+    "id": "74fcf6b5.dbb39",\r
     "type": "set",\r
     "name": "unset otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
     "comments": "",\r
-    "x": 4704,\r
-    "y": 6212,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4726.883331298828,\r
+    "y": 6227.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "52c2d3cf.976804",\r
+    "id": "34955381.c5797c",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4850.999755859375,\r
-    "y": 5934,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4873.883087158203,\r
+    "y": 5949.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6227c2aa.a1e1a4",\r
+    "id": "2a032dd9.9380b2",\r
     "type": "comment",\r
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "comments": "",\r
-    "x": 4987.999755859375,\r
-    "y": 5884,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5010.883087158203,\r
+    "y": 5899.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a387df7d.b7b76",\r
+    "id": "b937ed07.a77618",\r
     "type": "save",\r
     "name": "save ROOT UNI in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3795,\r
-    "y": 3490,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3817.883331298828,\r
+    "y": 3505.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a7eb3fa1.887168",\r
+    "id": "3dd82151.976f0e",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3977,\r
-    "y": 1745,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3999.883331298828,\r
+    "y": 1760.8833312988281,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c5a9fcf9.09d1b",\r
+    "id": "6b6522.bc964ae",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3955,\r
-    "y": 2615,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3977.883331298828,\r
+    "y": 2630.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7010bc9b.4157a4",\r
+    "id": "195c3e5b.085da2",\r
     "type": "comment",\r
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3786,\r
-    "y": 3957,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3808.883331298828,\r
+    "y": 3972.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2c9dde75.d2cff2",\r
+    "id": "a8e7354f.a1833",\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": 3467,\r
-    "y": 5989,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3489.883331298828,\r
+    "y": 6004.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6bdb71eb.cd7da",\r
+    "id": "a2dd9c19.75287",\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": 3678,\r
-    "y": 4866,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3700.883331298828,\r
+    "y": 4881.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5ba113f8.d2a564",\r
+    "id": "906b118c.b5ca4",\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": 3811,\r
-    "y": 4914,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3833.883331298828,\r
+    "y": 4929.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e80f8be5.03c42",\r
+    "id": "86c9672.840f818",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4357,\r
-    "y": 4542,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4379.883331298828,\r
+    "y": 4557.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "8d6edd02.689f",\r
-        "977606e5.20b248"\r
+        "b9a92126.1d0eb",\r
+        "e7523195.456808"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8d6edd02.689f",\r
+    "id": "b9a92126.1d0eb",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4550,\r
-    "y": 4543,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4572.883331298828,\r
+    "y": 4558.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "5ee87f24.28a388"\r
+        "71a4d763.a9eac"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "977606e5.20b248",\r
+    "id": "e7523195.456808",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4554,\r
-    "y": 4587,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4576.883331298828,\r
+    "y": 4602.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "89bf54cd.2d4a38"\r
+        "6742a953.fe0d28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "89bf54cd.2d4a38",\r
+    "id": "6742a953.fe0d28",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4693,\r
-    "y": 4582,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4715.883331298828,\r
+    "y": 4597.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "32dd4db5.fb786a",\r
-        "c09e6974.d8d248",\r
-        "47355e53.0b694"\r
+        "34f2cb8a.7f3954",\r
+        "50607a4b.9927b4",\r
+        "d6e6e1de.8f0598"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5ee87f24.28a388",\r
+    "id": "71a4d763.a9eac",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4693,\r
-    "y": 4539,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4715.883331298828,\r
+    "y": 4554.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "bed8a2a5.609b9",\r
-        "bbe5119a.b6b9a",\r
-        "2aa44f99.3f02c8",\r
-        "53ad7751.2dcd08"\r
+        "b61f10f5.eeecf",\r
+        "90640d99.12302",\r
+        "42e8372d.d506e",\r
+        "7679135b.31e8e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "32dd4db5.fb786a",\r
+    "id": "34f2cb8a.7f3954",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainA-uuid",\r
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 5095.000244140625,\r
-    "y": 4804,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5117.883575439453,\r
+    "y": 4819.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "62f002ed.2a5444",\r
+    "id": "9d0b91dc.02ae8",\r
     "type": "comment",\r
     "name": "populate connectivity-A variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5102.000244140625,\r
-    "y": 4758,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5124.883575439453,\r
+    "y": 4773.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "274ef282.e256ee",\r
+    "id": "9ca77368.01f7",\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": 4892,\r
-    "y": 6537,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4914.883331298828,\r
+    "y": 6552.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c09e6974.d8d248",\r
+    "id": "50607a4b.9927b4",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5213.000244140625,\r
-    "y": 4846,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5235.883575439453,\r
+    "y": 4861.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3264661d.b6671a",\r
+    "id": "7eeebeb3.54b298",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5088,\r
-    "y": 5104,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5110.883331298828,\r
+    "y": 5119.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7ec54c4d.3b77ec",\r
+    "id": "d039e4e7.e91be8",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3642,\r
-    "y": 4464,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3664.883331298828,\r
+    "y": 4479.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f9f5a12a.cd0cc",\r
+    "id": "3c0dfd8f.f0eaca",\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": 3976,\r
-    "y": 4647,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3998.883331298828,\r
+    "y": 4662.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "536ae5e9.b25a04",\r
+    "id": "80cc4c1e.a6bfe",\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": 3588,\r
-    "y": 4514,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3610.883331298828,\r
+    "y": 4529.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "d61393d.72bde7",\r
-        "afea424c.c72b88",\r
-        "48da2e94.b0d678"\r
+        "ef8f5d34.35bfc8",\r
+        "7b54fcfe.00d69c",\r
+        "e9708f34.58ed3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "afea424c.c72b88",\r
+    "id": "7b54fcfe.00d69c",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3815.490966796875,\r
-    "y": 4486.573974609375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3838.374298095703,\r
+    "y": 4502.457305908203,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "74d191cb.7bdf48"\r
+        "edc83f73.f7df38"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "48da2e94.b0d678",\r
+    "id": "e9708f34.58ed3",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3811,\r
-    "y": 4530.999938964844,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3833.883331298828,\r
+    "y": 4546.883270263672,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "d340d8ff.74286"\r
+        "a66e06b4.3bd7c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "74d191cb.7bdf48",\r
+    "id": "edc83f73.f7df38",\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": 3978.0625,\r
-    "y": 4485.859680175781,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4000.945831298828,\r
+    "y": 4501.743011474609,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d340d8ff.74286",\r
+    "id": "a66e06b4.3bd7c",\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": 3979,\r
-    "y": 4530.999938964844,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4001.883331298828,\r
+    "y": 4546.883270263672,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "60eac93d.331ca",\r
+    "id": "fa42d876.f3bfc8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3764,\r
-    "y": 4604,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3786.883331298828,\r
+    "y": 4619.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "a693b00.ef5e95",\r
-        "f9f5a12a.cd0cc"\r
+        "b660a30a.8893a8",\r
+        "3c0dfd8f.f0eaca"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d61393d.72bde7",\r
+    "id": "ef8f5d34.35bfc8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3595,\r
-    "y": 4604,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3617.883331298828,\r
+    "y": 4619.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "60eac93d.331ca"\r
+        "fa42d876.f3bfc8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a693b00.ef5e95",\r
+    "id": "b660a30a.8893a8",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 3953,\r
-    "y": 4596,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3975.883331298828,\r
+    "y": 4611.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5c19cae5.23f224",\r
+    "id": "3d1de5ec.2ac45a",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3786,\r
-    "y": 4742,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 3808.883331298828,\r
+    "y": 4757.883331298828,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a02818b5.44468",\r
+    "id": "25e4380.733ab48",\r
     "type": "comment",\r
     "name": "Temporary skipping this check - to support multiple instances in one slice",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5892.88330078125,\r
-    "y": 6554.88330078125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5915.766632080078,\r
+    "y": 6570.766632080078,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "47355e53.0b694",\r
+    "id": "d6e6e1de.8f0598",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5092.667236328125,\r
-    "y": 4942.08349609375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5115.550567626953,\r
+    "y": 4957.966827392578,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "be1641a6.50b31",\r
+    "id": "924c8eb8.8bcc2",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5094.884033203125,\r
-    "y": 4901.88330078125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5117.767364501953,\r
+    "y": 4917.766632080078,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cf1a8f36.08af8",\r
+    "id": "eadd33f3.5f43",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4968.6669921875,\r
-    "y": 5192.08349609375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4991.550323486328,\r
+    "y": 5207.966827392578,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "19ccdaa7.ec1b4d",\r
+    "id": "33d164e6.6e7844",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4970.8837890625,\r
-    "y": 5151.88330078125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4993.767120361328,\r
+    "y": 5167.766632080078,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "66b615d7.25ca4c",\r
+    "id": "3216abfb.82724c",\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": 5063.466796875,\r
-    "y": 5647.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5086.350128173828,\r
+    "y": 5663.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ea12eeb9.12b1f",\r
+    "id": "723b66c7.37bb08",\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": 4890.466796875,\r
-    "y": 5704.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4913.350128173828,\r
+    "y": 5720.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "7690697f.9ce41",\r
-        "27f9c6d9.503242"\r
+        "4b59f245.4d6edc",\r
+        "fb820a66.06fc1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7690697f.9ce41",\r
+    "id": "4b59f245.4d6edc",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5101.466796875,\r
-    "y": 5704.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5124.350128173828,\r
+    "y": 5720.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "714a5cc9.4d7a1c"\r
+        "95f01780.285928"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "27f9c6d9.503242",\r
+    "id": "fb820a66.06fc1",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5097.466796875,\r
-    "y": 5752.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5120.350128173828,\r
+    "y": 5768.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "b6a962d8.a724e8"\r
+        "ceaa430d.e25cf8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "714a5cc9.4d7a1c",\r
+    "id": "95f01780.285928",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5257.466796875,\r
-    "y": 5700.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5280.350128173828,\r
+    "y": 5716.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "1ac18bef.6e71e4",\r
-        "b2d3bd46.bdd318",\r
-        "7d68f1ff.1c9d18"\r
+        "363f2480.f640d4",\r
+        "ec57c9d5.e1e658",\r
+        "18db1f41.a7c409"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b6a962d8.a724e8",\r
+    "id": "ceaa430d.e25cf8",\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": 5245.466796875,\r
-    "y": 5747.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5268.350128173828,\r
+    "y": 5763.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a02cbc6f.9fe0b8",\r
+    "id": "7a15e8cb.5f6df8",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5523.3505859375,\r
-    "y": 5800.39990234375,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5546.233917236328,\r
+    "y": 5816.283233642578,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7d68f1ff.1c9d18",\r
+    "id": "18db1f41.a7c409",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5521.1337890625,\r
-    "y": 5840.60009765625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5544.017120361328,\r
+    "y": 5856.483428955078,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b2d3bd46.bdd318",\r
+    "id": "ec57c9d5.e1e658",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5640.466796875,\r
-    "y": 5752.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5663.350128173828,\r
+    "y": 5768.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1ac18bef.6e71e4",\r
+    "id": "363f2480.f640d4",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 5511.466796875,\r
-    "y": 5700.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5534.350128173828,\r
+    "y": 5716.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a899461.9a784b8",\r
+    "id": "60039858.187258",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4952.466796875,\r
-    "y": 5605.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4975.350128173828,\r
+    "y": 5621.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": []\r
   },\r
   {\r
-    "id": "eba4a386.8ade58",\r
+    "id": "6922fe88.2fe5f8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4659.7998046875,\r
-    "y": 5687.5166015625,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 4682.683135986328,\r
+    "y": 5703.399932861328,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       [\r
-        "66b615d7.25ca4c",\r
-        "ea12eeb9.12b1f"\r
+        "3216abfb.82724c",\r
+        "723b66c7.37bb08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "91ff8ca0.2410d8",\r
+    "id": "4514c9c4.eaef1",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4980.832763671875,\r
-    "y": 5989.2001953125,\r
-    "z": "211aaefb.d906ea",\r
+    "x": 5003.716094970703,\r
+    "y": 6005.083526611328,\r
+    "z": "4456793a.59a288",\r
     "wires": [\r
       []\r
     ]\r
+  },\r
+  {\r
+    "id": "d7548734.759b08",\r
+    "type": "call",\r
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5789,\r
+    "y": 6901,\r
+    "z": "4456793a.59a288",\r
+    "wires": [\r
+      []\r
+    ]\r
+  },\r
+  {\r
+    "id": "c3b316fd.fba0a8",\r
+    "type": "block",\r
+    "name": "block : atomic",\r
+    "xml": "<block atomic='true'>",\r
+    "atomic": "true",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5408,\r
+    "y": 6904,\r
+    "z": "4456793a.59a288",\r
+    "wires": [\r
+      [\r
+        "d7548734.759b08",\r
+        "d42bdb23.7a5dc8",\r
+        "40573be3.cee89c"\r
+      ]\r
+    ]\r
+  },\r
+  {\r
+    "id": "d42bdb23.7a5dc8",\r
+    "type": "switchNode",\r
+    "name": "switch $foundVpnName",\r
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5634,\r
+    "y": 6956,\r
+    "z": "4456793a.59a288",\r
+    "wires": [\r
+      [\r
+        "4a08f8b2.c71278"\r
+      ]\r
+    ]\r
+  },\r
+  {\r
+    "id": "4a08f8b2.c71278",\r
+    "type": "outcomeTrue",\r
+    "name": "true",\r
+    "xml": "<outcome value='true'>\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5813,\r
+    "y": 6955,\r
+    "z": "4456793a.59a288",\r
+    "wires": [\r
+      [\r
+        "b6424391.0ceee8"\r
+      ]\r
+    ]\r
+  },\r
+  {\r
+    "id": "40573be3.cee89c",\r
+    "type": "set",\r
+    "name": "set vpnNameToSearch",\r
+    "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
+    "comments": "",\r
+    "x": 5635,\r
+    "y": 6849,\r
+    "z": "4456793a.59a288",\r
+    "wires": []\r
   }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
index 241228f..50f87f4 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
@@ -3238,7 +3238,7 @@
         "id": "83634982.62f32",\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
+        "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",\r
         "comments": "",\r
         "x": 3288.883331298828,\r
         "y": 1754,\r
@@ -3271,7 +3271,7 @@
         "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
+        "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",\r
         "comments": "",\r
         "x": 3269.883331298828,\r
         "y": 2610,\r
@@ -4389,8 +4389,8 @@
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
         "info": "",\r
         "comments": "",\r
-        "x": 5188.784423828125,\r
-        "y": 4997.350067138672,\r
+        "x": 5119.783935546875,\r
+        "y": 4846.349884033203,\r
         "z": "d1eceead.adafe",\r
         "wires": []\r
     },\r
@@ -4401,8 +4401,8 @@
         "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": 5065.350067138672,\r
+        "x": 5063.783935546875,\r
+        "y": 4895.349884033203,\r
         "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
@@ -4418,8 +4418,8 @@
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5465.784454345703,\r
-        "y": 5037.349853515625,\r
+        "x": 5306.784423828125,\r
+        "y": 4936.349395751953,\r
         "z": "d1eceead.adafe",\r
         "wires": [\r
             []\r
@@ -4432,12 +4432,12 @@
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5346.784423828125,\r
-        "y": 4963.349822998047,\r
+        "x": 5317.7841796875,\r
+        "y": 4893.349609375,\r
         "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
-                "a5ecb13c.9c7548"\r
+                "b2c9765c.25999"\r
             ]\r
         ]\r
     },\r
@@ -4449,8 +4449,8 @@
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5473.767822265625,\r
-        "y": 4901.766326904297,\r
+        "x": 5544.767578125,\r
+        "y": 4900.76611328125,\r
         "z": "d1eceead.adafe",\r
         "wires": [\r
             [\r
@@ -9149,5 +9149,81 @@
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "b2c9765c.25999",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5113,\r
+        "y": 5050,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "86e944dc.0c4178",\r
+                "5fccecfa.290f3c",\r
+                "76c53fa0.8ab25"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "76c53fa0.8ab25",\r
+        "type": "set",\r
+        "name": "set vpnNameToSearch",\r
+        "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
+        "comments": "",\r
+        "x": 5340,\r
+        "y": 4995,\r
+        "z": "d1eceead.adafe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "86e944dc.0c4178",\r
+        "type": "call",\r
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5494,\r
+        "y": 5047,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "5fccecfa.290f3c",\r
+        "type": "switchNode",\r
+        "name": "switch $foundVpnName",\r
+        "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5339,\r
+        "y": 5102,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "2a17f2a1.8a9c0e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2a17f2a1.8a9c0e",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5518,\r
+        "y": 5101,\r
+        "z": "d1eceead.adafe",\r
+        "wires": [\r
+            [\r
+                "a5ecb13c.9c7548"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json
index 55104ea..592aa31 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "5597755d.1ce774",\r
+        "id": "3d72a78b.d5ca8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 147,\r
-        "y": 107,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 161.88333129882812,\r
+        "y": 93,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "8d0fd3e7.a3b7e8"\r
+                "9d241a09.87fad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d0fd3e7.a3b7e8",\r
+        "id": "9d241a09.87fad",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,339 +22,351 @@
         "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": 431.2856903076172,\r
-        "y": 168.23810863494873,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 446.1690216064453,\r
+        "y": 154.23810863494873,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "86b46a27.ca39b8"\r
+                "a7259be6.d447a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86b46a27.ca39b8",\r
+        "id": "a7259be6.d447a",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 386.4285888671875,\r
-        "y": 260.0000305175781,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 401.3119201660156,\r
+        "y": 246.00003051757812,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "15886f7b.32e089"\r
+                "d786d41.1f92da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15886f7b.32e089",\r
+        "id": "d786d41.1f92da8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 747.238037109375,\r
-        "y": 244.66668701171875,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 762.1213684082031,\r
+        "y": 230.66668701171875,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "6bd3471b.bd1a98",\r
-                "5dece674.dd027",\r
-                "4d1bc5df.1d031c"\r
+                "7a44c426.80c71c",\r
+                "e5338f68.a61cd8",\r
+                "c3537cef.9e14b8",\r
+                "a3ebaf5b.c985e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bd3471b.bd1a98",\r
+        "id": "7a44c426.80c71c",\r
         "type": "save",\r
         "name": "get all-connectivities from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivities\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.helper-root-all-connectivities\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 232,\r
-        "y": 430,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 246.88333129882812,\r
+        "y": 416,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "92e14f80.21594",\r
-                "b9796c74.99212",\r
-                "e5bd0a99.00585"\r
+                "e85393c.ba370f",\r
+                "a557e38f.6e9a5",\r
+                "30d0e737.4ae9c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92e14f80.21594",\r
+        "id": "e85393c.ba370f",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 476,\r
-        "y": 390,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 490.8833312988281,\r
+        "y": 376,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "61e9ae11.23c3a8"\r
+                "c39e44d3.0b437"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9796c74.99212",\r
+        "id": "a557e38f.6e9a5",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 473.490966796875,\r
-        "y": 439.57403564453125,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 488.3742980957031,\r
+        "y": 425.57403564453125,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "cd38df9d.37406"\r
+                "704ffa2b.4115fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5bd0a99.00585",\r
+        "id": "30d0e737.4ae9c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 471,\r
-        "y": 482,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 485.8833312988281,\r
+        "y": 468,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "62703aa0.44322c"\r
+                "628b9d60.85cb0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61e9ae11.23c3a8",\r
+        "id": "c39e44d3.0b437",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 624,\r
-        "y": 391,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 638.8833312988281,\r
+        "y": 377,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "ca24c19f.cdc85"\r
+                "e6b99f9d.23ec4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd38df9d.37406",\r
+        "id": "704ffa2b.4115fc",\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": 623.0623779296875,\r
-        "y": 439.8597717285156,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 637.9457092285156,\r
+        "y": 425.8597717285156,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "62703aa0.44322c",\r
+        "id": "628b9d60.85cb0c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 622,\r
-        "y": 479,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 636.8833312988281,\r
+        "y": 465,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ca24c19f.cdc85",\r
+        "id": "e6b99f9d.23ec4",\r
         "type": "for",\r
         "name": "for helprconnidx in all-connectivities",\r
         "xml": "<for index='helprconnidx' start='0' end='`$tmp.aai.helper-root-all-connectivities.connectivity_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 871,\r
-        "y": 386,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 885.8833312988281,\r
+        "y": 372,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "380582c8.7d331e"\r
+                "15f82643.3dda02"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "380582c8.7d331e",\r
+        "id": "15f82643.3dda02",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1118,\r
-        "y": 392,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 1132.8833312988281,\r
+        "y": 378,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "174c6173.8ff53f"\r
+                "d5d56de1.9016d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "206a627e.5c0d46",\r
+        "id": "7d92b34f.9e55dc",\r
         "type": "switchNode",\r
         "name": "switch color-aware is ROOT?",\r
         "xml": "\n<switch test=\"`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].color-aware == $tmp.ROOT.uni-p-interface-long`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 312,\r
-        "y": 641,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 326.8833312988281,\r
+        "y": 627,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "463cdf78.946e4"\r
+                "4a67b867.df0b6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "463cdf78.946e4",\r
+        "id": "4a67b867.df0b6",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 521,\r
-        "y": 635,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 535.8833312988281,\r
+        "y": 621,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "65cbe881.f7d1b"\r
+                "751ad577.51dfcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "65cbe881.f7d1b",\r
+        "id": "751ad577.51dfcc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 678,\r
-        "y": 635,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 692.8833312988281,\r
+        "y": 621,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "ba048fa4.246cf8",\r
-                "34ebbdc4.bca6fa",\r
-                "3a84227a.7da866"\r
+                "b438dfb2.fcca1",\r
+                "7030d1be.87fa18",\r
+                "31d23be7.1d5a84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5dece674.dd027",\r
+        "id": "e5338f68.a61cd8",\r
         "type": "set",\r
         "name": "unset found-root-connectivity",\r
         "xml": "<set>\n<parameter name='found-root-connectivity' value=\"false\" />\n",\r
         "comments": "",\r
-        "x": 990,\r
-        "y": 159,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 1004.8833312988281,\r
+        "y": 145,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba048fa4.246cf8",\r
+        "id": "b438dfb2.fcca1",\r
         "type": "set",\r
         "name": "set found-root-connectivity=true",\r
         "xml": "<set>\n<parameter name='found-root-connectivity' value=\"true\" />\n",\r
         "comments": "",\r
-        "x": 939,\r
-        "y": 583,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 953.8833312988281,\r
+        "y": 569,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "34ebbdc4.bca6fa",\r
+        "id": "7030d1be.87fa18",\r
         "type": "set",\r
         "name": "set tmp.aai.ROOT.connectivity.",\r
         "xml": "<set>\n<parameter name='tmp.aai.ROOT.connectivity.' value=\"`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].`\" />\n",\r
         "comments": "",\r
-        "x": 942,\r
-        "y": 636,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 956.8833312988281,\r
+        "y": 622,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d1bc5df.1d031c",\r
+        "id": "c3537cef.9e14b8",\r
         "type": "set",\r
         "name": "unset tmp.aai.ROOT.connectivity.",\r
         "xml": "<set>\n<parameter name='tmp.aai.ROOT.connectivity.' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 1008,\r
-        "y": 203,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 1022.8833312988281,\r
+        "y": 189,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a84227a.7da866",\r
+        "id": "31d23be7.1d5a84",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 870,\r
-        "y": 699,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 884.8833312988281,\r
+        "y": 685,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "174c6173.8ff53f",\r
+        "id": "d5d56de1.9016d",\r
         "type": "switchNode",\r
         "name": "switch conn type",\r
         "xml": "<switch test=\"`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].vpn-type`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 923.88330078125,\r
-        "y": 480.88330078125,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 938.7666320800781,\r
+        "y": 466.88330078125,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "466114cf.ced6ec"\r
+                "8760c9a3.310068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "466114cf.ced6ec",\r
+        "id": "8760c9a3.310068",\r
         "type": "outcome",\r
         "name": "root",\r
         "xml": "<outcome value='root'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1083.88330078125,\r
-        "y": 482.8833312988281,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 1098.7666320800781,\r
+        "y": 468.8833312988281,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "64ce81d.c0f0f"\r
+                "a38c2649.b4dd5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64ce81d.c0f0f",\r
+        "id": "a38c2649.b4dd5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1226.88330078125,\r
-        "y": 484.8833312988281,\r
-        "z": "2d4ea144.5587f6",\r
+        "x": 1241.7666320800781,\r
+        "y": 470.8833312988281,\r
+        "z": "fa25e836.5eaa88",\r
         "wires": [\r
             [\r
-                "206a627e.5c0d46"\r
+                "7d92b34f.9e55dc"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "a3ebaf5b.c985e",\r
+        "type": "set",\r
+        "name": "unset tmp.aai.helper-root-all-connectivities",\r
+        "xml": "<set>\n<parameter name='tmp.aai.helper-root-all-connectivities.' value=\"\" />\n",\r
+        "comments": "",\r
+        "x": 1068,\r
+        "y": 244,\r
+        "z": "fa25e836.5eaa88",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json
index 713d6ab..1e578f8 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "4ee6b24.013d9cc",\r
+        "id": "aeb91e9b.d42c7",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 163,\r
-        "y": 91,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 189.88333129882812,\r
+        "y": 84.88333129882812,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "42ee2cb2.8b0aa4"\r
+                "84614040.2c4ec8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42ee2cb2.8b0aa4",\r
+        "id": "84614040.2c4ec8",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,339 +22,620 @@
         "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": 447.2856903076172,\r
-        "y": 152.23810863494873,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 474.1690216064453,\r
+        "y": 146.12143993377686,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "2d8be51e.1fe5b2"\r
+                "8109fba8.cb20c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d8be51e.1fe5b2",\r
+        "id": "8109fba8.cb20c",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-helper-find-connectivity",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 402.4285888671875,\r
-        "y": 244.00003051757812,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 429.3119201660156,\r
+        "y": 237.88336181640625,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "44543bcb.341e5c"\r
+                "dc0a4608.eb89a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44543bcb.341e5c",\r
+        "id": "dc0a4608.eb89a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 763.238037109375,\r
-        "y": 228.66668701171875,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 790.1213684082031,\r
+        "y": 222.55001831054688,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "93197478.d2fae",\r
-                "eb6c2023.7ef7a",\r
-                "d72f415d.01bc08"\r
+                "509ec296.1bbe8c",\r
+                "5920f715.1dd26",\r
+                "838a9489.ed1eb",\r
+                "9abf8c8.8d1f07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93197478.d2fae",\r
+        "id": "509ec296.1bbe8c",\r
         "type": "save",\r
         "name": "get all-connectivities from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivities\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.helper-all-connectivities\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 248,\r
-        "y": 414,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 274.8833312988281,\r
+        "y": 407.8833312988281,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "3210bd43.c197f2",\r
-                "cb92b047.8ddef8",\r
-                "39efd1fc.091d56"\r
+                "718aef78.41717",\r
+                "f4bff51a.32c2a",\r
+                "be13a17a.8d69d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3210bd43.c197f2",\r
+        "id": "718aef78.41717",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 492,\r
-        "y": 374,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 518.8833312988281,\r
+        "y": 367.8833312988281,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "b85791e3.02f868"\r
+                "41301f82.8c086"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb92b047.8ddef8",\r
+        "id": "f4bff51a.32c2a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 489.490966796875,\r
-        "y": 423.57403564453125,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 516.3742980957031,\r
+        "y": 417.4573669433594,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "7f9747fb.6ed01"\r
+                "46c2d85d.47d55"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39efd1fc.091d56",\r
+        "id": "be13a17a.8d69d8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 487,\r
-        "y": 466,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 513.8833312988281,\r
+        "y": 459.8833312988281,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "d53ce1e7.42a2c"\r
+                "c5665fd8.f3a29"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b85791e3.02f868",\r
+        "id": "41301f82.8c086",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 640,\r
-        "y": 375,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 666.8833312988281,\r
+        "y": 368.8833312988281,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "538f3beb.2d964c"\r
+                "de5d49ec.648cb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f9747fb.6ed01",\r
+        "id": "46c2d85d.47d55",\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": 639.0623779296875,\r
-        "y": 423.8597717285156,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 665.9457092285156,\r
+        "y": 417.74310302734375,\r
+        "z": "b7dcb328.93d858",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d53ce1e7.42a2c",\r
+        "id": "c5665fd8.f3a29",\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": 638,\r
-        "y": 463,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 664.8833312988281,\r
+        "y": 456.8833312988281,\r
+        "z": "b7dcb328.93d858",\r
         "wires": []\r
     },\r
     {\r
-        "id": "538f3beb.2d964c",\r
+        "id": "de5d49ec.648cb",\r
         "type": "for",\r
         "name": "for helpconnidx in all-connectivities",\r
         "xml": "<for index='helpconnidx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 887,\r
-        "y": 370,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 913.8833312988281,\r
+        "y": 363.8833312988281,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "344678ba.b7f29"\r
+                "64800a1.2a06474"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "344678ba.b7f29",\r
+        "id": "64800a1.2a06474",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1134,\r
-        "y": 376,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 784.88330078125,\r
+        "y": 540.8833312988281,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "d48cc8ae.307b68"\r
+                "f3fa10d8.6f9d4",\r
+                "aad0e41e.4e03c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d48cc8ae.307b68",\r
+        "id": "31c74b2e.3b274c",\r
         "type": "switchNode",\r
         "name": "switch current provider-id?",\r
         "xml": "\n<switch test=\"`$tmp.current-provider-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 328,\r
-        "y": 625,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 345.88330078125,\r
+        "y": 984.88330078125,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "bc092a3b.859928"\r
+                "7e112bdd.b19944"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc092a3b.859928",\r
+        "id": "7e112bdd.b19944",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 537,\r
-        "y": 619,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 554.88330078125,\r
+        "y": 978.88330078125,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "121a7afe.07beb5"\r
+                "c05a9bda.8a79"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "121a7afe.07beb5",\r
+        "id": "c05a9bda.8a79",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 694,\r
-        "y": 619,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 711.88330078125,\r
+        "y": 978.88330078125,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "7603071b.598a38"\r
+                "55ad0392.5f6db4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7603071b.598a38",\r
+        "id": "55ad0392.5f6db4",\r
         "type": "switchNode",\r
         "name": "switch current-cvlan-id?",\r
         "xml": "\n<switch test=\"`$tmp.current-cvlan-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].cvlan`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 320,\r
-        "y": 713,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 337.88330078125,\r
+        "y": 1072.88330078125,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "e6157f7f.780a28"\r
+                "788f496d.e066e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6157f7f.780a28",\r
+        "id": "788f496d.e066e8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 529,\r
-        "y": 707,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 546.88330078125,\r
+        "y": 1066.88330078125,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "4bd1a2a7.9f2d14"\r
+                "6fac95a4.8d5e0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb6c2023.7ef7a",\r
+        "id": "5920f715.1dd26",\r
         "type": "set",\r
         "name": "unset found-connectivity",\r
         "xml": "<set>\n<parameter name='found-connectivity' value=\"false\" />\n",\r
         "comments": "",\r
-        "x": 1006,\r
-        "y": 143,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 1032.8833312988281,\r
+        "y": 136.88333129882812,\r
+        "z": "b7dcb328.93d858",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c418ca90.026d18",\r
+        "id": "276095dd.4c3c5a",\r
         "type": "set",\r
         "name": "set found-connectivity=true",\r
         "xml": "<set>\n<parameter name='found-connectivity' value=\"true\" />\n",\r
         "comments": "",\r
-        "x": 935,\r
-        "y": 707,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 952.88330078125,\r
+        "y": 1066.88330078125,\r
+        "z": "b7dcb328.93d858",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4bd1a2a7.9f2d14",\r
+        "id": "6fac95a4.8d5e0c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 697,\r
-        "y": 708,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 714.88330078125,\r
+        "y": 1067.88330078125,\r
+        "z": "b7dcb328.93d858",\r
         "wires": [\r
             [\r
-                "c418ca90.026d18",\r
-                "cce4f57f.9fec88",\r
-                "cc11b7b4.773dc8"\r
+                "276095dd.4c3c5a",\r
+                "35f5de07.464e0a",\r
+                "40d9d0fe.d02c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cce4f57f.9fec88",\r
+        "id": "35f5de07.464e0a",\r
         "type": "set",\r
         "name": "set the-connectivity",\r
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].`\" />\n",\r
         "comments": "",\r
-        "x": 916,\r
-        "y": 763,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 933.88330078125,\r
+        "y": 1122.88330078125,\r
+        "z": "b7dcb328.93d858",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d72f415d.01bc08",\r
+        "id": "838a9489.ed1eb",\r
         "type": "set",\r
         "name": "unset tmp.the-connectivity.",\r
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 1010,\r
-        "y": 187,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 1036.8833312988281,\r
+        "y": 180.88333129882812,\r
+        "z": "b7dcb328.93d858",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc11b7b4.773dc8",\r
+        "id": "40d9d0fe.d02c3",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 877,\r
-        "y": 814,\r
-        "z": "1453a3a4.2dddfc",\r
+        "x": 894.88330078125,\r
+        "y": 1173.88330078125,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9abf8c8.8d1f07",\r
+        "type": "set",\r
+        "name": "unset tmp.aai.helper-all-connectivities",\r
+        "xml": "<set>\n<parameter name='tmp.aai.helper-all-connectivities.' value=\"\" />\n",\r
+        "comments": "",\r
+        "x": 1063,\r
+        "y": 233,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9cad442b.773338",\r
+        "type": "switchNode",\r
+        "name": "switch access-provider-id != ''",\r
+        "xml": "<switch test=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id != ''`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1043,\r
+        "y": 633,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "4d1586da.4c4ea8",\r
+                "8c666101.3ce288"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f3fa10d8.6f9d4",\r
+        "type": "record",\r
+        "name": "record access-provider-id",\r
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`\"/>\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1022,\r
+        "y": 481,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "aad0e41e.4e03c",\r
+        "type": "switchNode",\r
+        "name": "access-provider-id empty?",\r
+        "xml": "<switch test='`length($tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id) == 0`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1031,\r
+        "y": 543,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "ea8bd792.630a88",\r
+                "3693d975.d419ee"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ea8bd792.630a88",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1242,\r
+        "y": 521,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "266f1b69.40bd84"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3693d975.d419ee",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1250,\r
+        "y": 577,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "be2ed43a.87e25"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "266f1b69.40bd84",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1379,\r
+        "y": 522,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "be2ed43a.87e25",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1382,\r
+        "y": 578,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "9cad442b.773338"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4d1586da.4c4ea8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1250,\r
+        "y": 683,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "ebe04a71.67d7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8c666101.3ce288",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1252,\r
+        "y": 635,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "dea822fb.78f968"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ebe04a71.67d7",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1388,\r
+        "y": 687,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "bc41ce93.ef44f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dea822fb.78f968",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1383,\r
+        "y": 635,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "bc41ce93.ef44f8",\r
+        "type": "switchNode",\r
+        "name": "switch type is not mdsc",\r
+        "xml": "<switch test=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].vpn-type != 'mdsc' `\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1023,\r
+        "y": 732,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "66c221d8.65d09",\r
+                "1093c517.0894a3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "66c221d8.65d09",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1239,\r
+        "y": 733,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "a35a8a78.60736"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1093c517.0894a3",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1237,\r
+        "y": 781,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "4932f7b5.545a3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a35a8a78.60736",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1370,\r
+        "y": 733,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4932f7b5.545a3",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1375,\r
+        "y": 785,\r
+        "z": "b7dcb328.93d858",\r
+        "wires": [\r
+            [\r
+                "31c74b2e.3b274c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e835ab85.de0738",\r
+        "type": "comment",\r
+        "name": "access-provider-id in mdsc connectivity should be empty",\r
+        "info": "middle-man connectivity should not have its access-provider-id set. It should be empty.",\r
+        "comments": "",\r
+        "x": 1095,\r
+        "y": 443,\r
+        "z": "b7dcb328.93d858",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.json
index 340a1b8..f22b986 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.json
@@ -1,590 +1,590 @@
 [\r
     {\r
-        "id": "7b0a2375.19194c",\r
+        "id": "ae6ce233.cb49c8",\r
         "type": "save",\r
         "name": "get all-connectivities from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivities\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/connectivities\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-connectivities\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 271,\r
-        "y": 341,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 342.8833312988281,\r
+        "y": 355,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "f06c3947.630bf",\r
-                "baa57021.06de88",\r
-                "770d11f9.13541"\r
+                "ad0ebe6a.108058",\r
+                "e70f7c6d.fdd708",\r
+                "478400c1.aa8de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f06c3947.630bf",\r
+        "id": "ad0ebe6a.108058",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 509,\r
-        "y": 309,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 580.8833312988281,\r
+        "y": 323,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "8f09fc1f.1f9e1"\r
+                "39997c10.b90074"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "baa57021.06de88",\r
+        "id": "e70f7c6d.fdd708",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 509.490966796875,\r
-        "y": 354.57403564453125,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 581.3742980957031,\r
+        "y": 368.57403564453125,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "770d11f9.13541",\r
+        "id": "478400c1.aa8de8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 507,\r
-        "y": 398,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 578.8833312988281,\r
+        "y": 412,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8f09fc1f.1f9e1",\r
+        "id": "39997c10.b90074",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 682,\r
-        "y": 307,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 753.8833312988281,\r
+        "y": 321,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "e755721c.711348"\r
+                "aefbd8d9.0d607"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15095086.d2123f",\r
+        "id": "11206470.526174",\r
         "type": "for",\r
         "name": "for connidx in all-connectivities",\r
         "xml": "<for index='connidx' start='0' end='`$tmp.aai.all-connectivities.connectivity_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 718,\r
-        "y": 528,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 789.8833312988281,\r
+        "y": 542,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "990dc4a9.cfdf28"\r
+                "f0aadf36.87aff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "990dc4a9.cfdf28",\r
+        "id": "f0aadf36.87aff",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 157,\r
-        "y": 624,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 228.88333129882812,\r
+        "y": 638,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "504b7173.9a04",\r
-                "abd234d.58ac848"\r
+                "a9594d85.e9f878",\r
+                "380d57d7.fea4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "504b7173.9a04",\r
+        "id": "a9594d85.e9f878",\r
         "type": "switchNode",\r
         "name": "switch conn type is mdsc",\r
         "xml": "<switch test=\"`$tmp.aai.all-connectivities.connectivity[$connidx].vpn-type == 'mdsc' `\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 187,\r
-        "y": 745,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 258.8833312988281,\r
+        "y": 759,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "21e297f1.dc3d08",\r
-                "1c75dc19.23204c"\r
+                "cd105cc3.e86598",\r
+                "e73994bf.bcc7a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21e297f1.dc3d08",\r
+        "id": "cd105cc3.e86598",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 391,\r
-        "y": 778,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 462.8833312988281,\r
+        "y": 792,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "f10ea601.371e28"\r
+                "fb61d765.95738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c75dc19.23204c",\r
+        "id": "e73994bf.bcc7a",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 393,\r
-        "y": 723,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 464.8833312988281,\r
+        "y": 737,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "eba2e2ab.d5d96"\r
+                "87d4935c.7f47b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f10ea601.371e28",\r
+        "id": "fb61d765.95738",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 543,\r
-        "y": 778,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 614.8833312988281,\r
+        "y": 792,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "7a2fe87b.22223"\r
+                "fce0046e.17ed4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e755721c.711348",\r
+        "id": "aefbd8d9.0d607",\r
         "type": "switchNode",\r
         "name": "switch conn list empty?",\r
         "xml": "<switch test=\"`$tmp.aai.all-connectivities.connectivity_length == 0`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 274,\r
-        "y": 523,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 345.8833312988281,\r
+        "y": 537,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "f98c61eb.311468",\r
-                "f482191d.a1c73"\r
+                "226ed271.6fe31e",\r
+                "c192b354.6af6d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f98c61eb.311468",\r
+        "id": "226ed271.6fe31e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 499,\r
-        "y": 458,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 570.8833312988281,\r
+        "y": 472,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f482191d.a1c73",\r
+        "id": "c192b354.6af6d8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 493,\r
-        "y": 528,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 564.8833312988281,\r
+        "y": 542,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "15095086.d2123f"\r
+                "11206470.526174"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6a19ff.e5e506",\r
+        "id": "e5434531.84e89",\r
         "type": "comment",\r
         "name": "ein addi normal",\r
         "info": "",\r
         "comments": "",\r
-        "x": 644,\r
-        "y": 457,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 715.8833312988281,\r
+        "y": 471,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6b9d01c8.8380d",\r
+        "id": "faa6b1fb.f35298",\r
         "type": "comment",\r
         "name": "ein addi normal",\r
         "info": "",\r
         "comments": "",\r
-        "x": 667,\r
-        "y": 353,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 738.8833312988281,\r
+        "y": 367,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b66feaa.e86c28",\r
+        "id": "af480ce1.7cb108",\r
         "type": "comment",\r
         "name": "ein addi normal",\r
         "info": "",\r
         "comments": "",\r
-        "x": 662,\r
-        "y": 396,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 733.8833312988281,\r
+        "y": 410,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d5e8e6d4.6174b",\r
+        "id": "b34ecdaf.e57d9",\r
         "type": "switchNode",\r
         "name": "switch conn vlan same as curr ll",\r
         "xml": "<!--<switch test=\"`$tmp.aai.all-connectivities.connectivity[$connidx].cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `\">-->\n<switch test=\"`$tmp.aai.mmrconnectivity.cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 236,\r
-        "y": 1432,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 307.8833312988281,\r
+        "y": 1446,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "cd252ece.fc6de",\r
-                "60cb2182.fee2"\r
+                "91cd0712.b09c18",\r
+                "b11fe991.358eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd252ece.fc6de",\r
+        "id": "91cd0712.b09c18",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 447,\r
-        "y": 1402,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 518.8833312988281,\r
+        "y": 1416,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "4f3cf1a8.7050e"\r
+                "1f3692a3.acfe3d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60cb2182.fee2",\r
+        "id": "b11fe991.358eb",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 445,\r
-        "y": 1454,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 516.8833312988281,\r
+        "y": 1468,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "cef30c4.ef4cd7"\r
+                "234b7ab5.de6a7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eba2e2ab.d5d96",\r
+        "id": "87d4935c.7f47b",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 548,\r
-        "y": 722,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 619.8833312988281,\r
+        "y": 736,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4f3cf1a8.7050e",\r
+        "id": "1f3692a3.acfe3d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 602,\r
-        "y": 1403,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 673.8833312988281,\r
+        "y": 1417,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cef30c4.ef4cd7",\r
+        "id": "234b7ab5.de6a7e",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='connrelidx' start='0' end='`$tmp.aai.mmrconnectivity.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 629,\r
-        "y": 1452,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 700.8833312988281,\r
+        "y": 1466,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "d05fb37f.c486c8",\r
-                "1276102f.a824d8"\r
+                "b4ee2585.74fbf",\r
+                "ff81000b.fb7c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d05fb37f.c486c8",\r
+        "id": "b4ee2585.74fbf",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 835,\r
-        "y": 1452,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 906.8833312988281,\r
+        "y": 1466,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "25263c04.90ef7c"\r
+                "2cc806a4.6e3c9a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25263c04.90ef7c",\r
+        "id": "2cc806a4.6e3c9a",\r
         "type": "outcome",\r
         "name": "UNI",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 999.28564453125,\r
-        "y": 1451.82177734375,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1071.1689758300781,\r
+        "y": 1465.82177734375,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "15768efa.a62941"\r
+                "38fac4a0.444754"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15768efa.a62941",\r
+        "id": "38fac4a0.444754",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 197.1171875,\r
-        "y": 1553.34033203125,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 269.0005187988281,\r
+        "y": 1567.34033203125,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "1e97f046.fc5fc8",\r
-                "11d23afb.a558bd"\r
+                "825d7520.c89d3",\r
+                "f01e6cc3.227fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5f57787.9b2fc8",\r
+        "id": "3d5ae731.2a14e8",\r
         "type": "comment",\r
         "name": "TODO",\r
         "info": "",\r
         "comments": "",\r
-        "x": 216,\r
-        "y": 1460,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 287.8833312988281,\r
+        "y": 1474,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3f1e619e.884ab6",\r
+        "id": "370aae9e.ee24b2",\r
         "type": "switchNode",\r
         "name": "switch uni.tp-id is ROOT",\r
         "xml": "<switch test='`$tmp.aai.uni.id == $tmp.ROOT.uni-p-interface-long`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 916,\r
-        "y": 1555,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 987.8833312988281,\r
+        "y": 1569,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "b4219e4f.0520e",\r
-                "777497f5.84d998"\r
+                "7e154eb9.5d4cc8",\r
+                "afc167b3.ef6778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e97f046.fc5fc8",\r
+        "id": "825d7520.c89d3",\r
         "type": "set",\r
         "name": "set tmp.uni.id",\r
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
-        "x": 370,\r
-        "y": 1549,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 441.8833312988281,\r
+        "y": 1563,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1276102f.a824d8",\r
+        "id": "ff81000b.fb7c2",\r
         "type": "set",\r
         "name": "unset tmp.uni.id",\r
         "xml": "<set>\n<parameter name='tmp.uni.id' value='' />\n",\r
         "comments": "",\r
-        "x": 828,\r
-        "y": 1402,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 899.8833312988281,\r
+        "y": 1416,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11d23afb.a558bd",\r
+        "id": "f01e6cc3.227fc",\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": 373,\r
-        "y": 1596,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 444.8833312988281,\r
+        "y": 1610,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "892d20e.12d85e",\r
-                "7da1ee3a.e78cb",\r
-                "58ab5e35.f749d"\r
+                "ea6303b2.75e68",\r
+                "a6891bca.04787",\r
+                "9b99051a.095eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "892d20e.12d85e",\r
+        "id": "ea6303b2.75e68",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 545,\r
-        "y": 1580,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 616.8833312988281,\r
+        "y": 1594,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "8ca2de8b.fa6f4"\r
+                "49a1213f.79c1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7da1ee3a.e78cb",\r
+        "id": "a6891bca.04787",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 545.490966796875,\r
-        "y": 1625.5740356445312,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 617.3742980957031,\r
+        "y": 1639.5740356445312,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "889ff.98f506018"\r
+                "e29da398.a00668"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58ab5e35.f749d",\r
+        "id": "9b99051a.095eb8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 546,\r
-        "y": 1666,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 617.8833312988281,\r
+        "y": 1680,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "8d5edab7.25bff"\r
+                "fe2cb11b.f77b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "889ff.98f506018",\r
+        "id": "e29da398.a00668",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='uni not found' />\n",\r
         "comments": "",\r
-        "x": 696,\r
-        "y": 1626,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 767.8833312988281,\r
+        "y": 1640,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d5edab7.25bff",\r
+        "id": "fe2cb11b.f77b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='uni not found' />\n",\r
         "comments": "",\r
-        "x": 693,\r
-        "y": 1665,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 764.8833312988281,\r
+        "y": 1679,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ca2de8b.fa6f4",\r
+        "id": "49a1213f.79c1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 706,\r
-        "y": 1576,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 777.8833312988281,\r
+        "y": 1590,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "8429b9e7.1b46b",\r
-                "f62ad7f3.b94538"\r
+                "8ee8b27a.1e548",\r
+                "36182b29.e459c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc37f012.c984b",\r
+        "id": "20dd4097.429e6",\r
         "type": "comment",\r
         "name": "THIS SHOULD BE RETIRED?",\r
         "info": "",\r
         "comments": "",\r
-        "x": 898,\r
-        "y": 1509,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 969.8833312988281,\r
+        "y": 1523,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7004653.aced4",\r
+        "id": "f8a7e147.d035a",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 178,\r
-        "y": 78,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 249.88333129882812,\r
+        "y": 92,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "4d6292f9.29a84c"\r
+                "9c94eec9.5c0dd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d6292f9.29a84c",\r
+        "id": "9c94eec9.5c0dd8",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -592,853 +592,877 @@
         "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": 462.2856903076172,\r
-        "y": 139.23810863494873,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 534.1690216064453,\r
+        "y": 153.23810863494873,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "cb7f429c.c16cd8"\r
+                "482cf9ba.cfa1a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb7f429c.c16cd8",\r
+        "id": "482cf9ba.cfa1a8",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-logic",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-logic' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 468.42860412597656,\r
-        "y": 224.00003051757812,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 540.3119354248047,\r
+        "y": 238.00003051757812,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "f9801a6c.b832c"\r
+                "c6167e24.8c2b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9801a6c.b832c",\r
+        "id": "c6167e24.8c2b48",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 778.238037109375,\r
-        "y": 215.66668701171875,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 850.1213684082031,\r
+        "y": 229.66668701171875,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "7b0a2375.19194c",\r
-                "faf609fb.751ba",\r
-                "a41833d1.ac9d88",\r
-                "5bc7dc0.190fca4",\r
-                "287c8e9d.ecd2da"\r
+                "ae6ce233.cb49c8",\r
+                "38523ea0.abfb72",\r
+                "7dfa60b1.017b38",\r
+                "bf82e982.34914",\r
+                "9f305e4b.2c08a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dfb8236b.074ec8",\r
+        "id": "11d67f79.34efb1",\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": 1418,\r
-        "y": 1597,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1489.8833312988281,\r
+        "y": 1611,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4219e4f.0520e",\r
+        "id": "7e154eb9.5d4cc8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1095,\r
-        "y": 1511,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1166.8833312988281,\r
+        "y": 1525,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "71aa028b.bdc3e4"\r
+                "93854e03.17954"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "777497f5.84d998",\r
+        "id": "afc167b3.ef6778",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1094,\r
-        "y": 1567,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1165.8833312988281,\r
+        "y": 1581,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "aa4430ef.d9e498"\r
+                "76ae18a3.6c831"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa4430ef.d9e498",\r
+        "id": "76ae18a3.6c831",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1236,\r
-        "y": 1566,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1307.8833312988281,\r
+        "y": 1580,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "dfb8236b.074ec8",\r
-                "e041bd52.978d1"\r
+                "11d67f79.34efb1",\r
+                "1deeeaf.25d7015"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e041bd52.978d1",\r
+        "id": "1deeeaf.25d7015",\r
         "type": "set",\r
         "name": "set found-middle-man",\r
         "xml": "<set>\n<parameter name='found-middle-man' value=\"true\" />\n",\r
         "comments": "",\r
-        "x": 1422,\r
-        "y": 1543,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1493.8833312988281,\r
+        "y": 1557,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "faf609fb.751ba",\r
+        "id": "38523ea0.abfb72",\r
         "type": "set",\r
         "name": "set found-middle-man",\r
         "xml": "<set>\n<parameter name='found-middle-man' value=\"false\" />\n",\r
         "comments": "",\r
-        "x": 1016,\r
-        "y": 152,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1087.8833312988281,\r
+        "y": 166,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8429b9e7.1b46b",\r
+        "id": "8ee8b27a.1e548",\r
         "type": "switchNode",\r
         "name": "switch uni-tp-id-node-part is OTHERSIRE-NODEONLY",\r
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 945,\r
-        "y": 1972,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1016.8833312988281,\r
+        "y": 1986,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "967dd77f.a9ddf8",\r
-                "3a04bb6.f5843c4"\r
+                "27dde82a.2f3c2",\r
+                "cd264050.8e9db"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "967dd77f.a9ddf8",\r
+        "id": "27dde82a.2f3c2",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1226,\r
-        "y": 1949,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1297.8833312988281,\r
+        "y": 1963,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "e6273a1e.a882d8"\r
+                "509e3144.330748"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a04bb6.f5843c4",\r
+        "id": "cd264050.8e9db",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1219,\r
-        "y": 2008,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1290.8833312988281,\r
+        "y": 2022,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "ad97b1cf.83f91"\r
+                "b8b89d47.17e2d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad97b1cf.83f91",\r
+        "id": "b8b89d47.17e2d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1361,\r
-        "y": 2007,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1432.8833312988281,\r
+        "y": 2021,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "5b517936.cbfa08",\r
-                "311640ea.18d798",\r
-                "1778233a.2c990d",\r
-                "aa0b4226.979d68"\r
+                "f293ac63.f31218",\r
+                "d839efbf.779a6",\r
+                "92b81e5e.75b818",\r
+                "5bc64c01.f1d944",\r
+                "94ffeddc.43efb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71aa028b.bdc3e4",\r
+        "id": "93854e03.17954",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1237,\r
-        "y": 1501,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1308.8833312988281,\r
+        "y": 1515,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e6273a1e.a882d8",\r
+        "id": "509e3144.330748",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1356,\r
-        "y": 1953,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1427.8833312988281,\r
+        "y": 1967,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "311640ea.18d798",\r
+        "id": "d839efbf.779a6",\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": 1569,\r
-        "y": 2026,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1640.8833312988281,\r
+        "y": 2040,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b517936.cbfa08",\r
+        "id": "f293ac63.f31218",\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": 1553,\r
-        "y": 1974,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1624.8833312988281,\r
+        "y": 1988,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a41833d1.ac9d88",\r
+        "id": "7dfa60b1.017b38",\r
         "type": "set",\r
         "name": "set no-pce-call",\r
         "xml": "<set>\n<parameter name='no-pce-call' value=\"false\" />\n",\r
         "comments": "",\r
-        "x": 993,\r
-        "y": 198,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1064.8833312988281,\r
+        "y": 212,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "663e6db8.3ac154",\r
+        "id": "5ac1fa22.3be604",\r
         "type": "comment",\r
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",\r
         "info": "",\r
         "comments": "",\r
-        "x": 966,\r
-        "y": 1781,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1037.8833312988281,\r
+        "y": 1795,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f62ad7f3.b94538",\r
+        "id": "36182b29.e459c4",\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": 901,\r
-        "y": 1838,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 972.8833312988281,\r
+        "y": 1852,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "a1c99a4f.cc4ba8",\r
-                "b212c5d0.bf7fe"\r
+                "1e88bba0.df5a0c",\r
+                "cf2a5e36.db8d08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b212c5d0.bf7fe",\r
+        "id": "cf2a5e36.db8d08",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1124,\r
-        "y": 1824,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1195.8833312988281,\r
+        "y": 1838,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "476892d7.bc3d8c"\r
+                "6c1ba065.ca6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1c99a4f.cc4ba8",\r
+        "id": "1e88bba0.df5a0c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1126,\r
-        "y": 1857,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1197.8833312988281,\r
+        "y": 1871,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "cb705f2e.381028"\r
+                "1fbe5fca.067f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "476892d7.bc3d8c",\r
+        "id": "6c1ba065.ca6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1272,\r
-        "y": 1817,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1343.8833312988281,\r
+        "y": 1831,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "dd2db0f7.6e11c8"\r
+                "1fe3499.6fc8f36"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb705f2e.381028",\r
+        "id": "1fbe5fca.067f6",\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": 1269,\r
-        "y": 1854,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1340.8833312988281,\r
+        "y": 1868,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd2db0f7.6e11c8",\r
+        "id": "1fe3499.6fc8f36",\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": 1449,\r
-        "y": 1817,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1520.8833312988281,\r
+        "y": 1831,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a2fe87b.22223",\r
+        "id": "fce0046e.17ed4",\r
         "type": "switchNode",\r
         "name": "switch color-aware is ROOT",\r
         "xml": "<switch test=\"`$tmp.aai.all-connectivities.connectivity[$connidx].color-aware == $tmp.ROOT.uni-p-interface-long`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 789,\r
-        "y": 777,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 860.8833312988281,\r
+        "y": 791,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "173f4814.22298",\r
-                "e05c6609.d62108"\r
+                "b74a4f09.9ed18",\r
+                "14087de4.567de2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "173f4814.22298",\r
+        "id": "b74a4f09.9ed18",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 989,\r
-        "y": 738,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1060.8833312988281,\r
+        "y": 752,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "c2195b31.7e4bd"\r
+                "d1c419ac.9685a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e05c6609.d62108",\r
+        "id": "14087de4.567de2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 988,\r
-        "y": 794,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1059.8833312988281,\r
+        "y": 808,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "debff193.d4e6d"\r
+                "edcebb95.f9b518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2195b31.7e4bd",\r
+        "id": "d1c419ac.9685a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1131,\r
-        "y": 728,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1202.8833312988281,\r
+        "y": 742,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "debff193.d4e6d",\r
+        "id": "edcebb95.f9b518",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1130,\r
-        "y": 793,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1201.8833312988281,\r
+        "y": 807,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "e8efcfa.5f73cb",\r
-                "c46e249d.aa62a8"\r
+                "b8f288cf.803b8",\r
+                "f15c072a.39099"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c46e249d.aa62a8",\r
+        "id": "f15c072a.39099",\r
         "type": "set",\r
         "name": "set found-middle-man",\r
         "xml": "<set>\n<parameter name='found-middle-man' value=\"true\" />\n",\r
         "comments": "",\r
-        "x": 1341,\r
-        "y": 750,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1412.8833312988281,\r
+        "y": 764,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e8efcfa.5f73cb",\r
+        "id": "b8f288cf.803b8",\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": 1342,\r
-        "y": 802,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1413.8833312988281,\r
+        "y": 816,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5bc7dc0.190fca4",\r
+        "id": "bf82e982.34914",\r
         "type": "set",\r
         "name": "unset tmp.aai.all-connectivities",\r
         "xml": "<set>\n<parameter name='tmp.aai.all-connectivities.' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 991,\r
-        "y": 100,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1062.8833312988281,\r
+        "y": 114,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "287c8e9d.ecd2da",\r
+        "id": "9f305e4b.2c08a8",\r
         "type": "set",\r
         "name": "unset middle-man-conn",\r
         "xml": "<set>\n<parameter name='middle-man-conn.' value='' />\n",\r
         "comments": "",\r
-        "x": 957,\r
-        "y": 64,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1028.8833312988281,\r
+        "y": 78,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5330b6b3.3bf2d8",\r
+        "id": "1eb5be31.ea0af2",\r
         "type": "record",\r
         "name": "record tmp.pce-src and dst node",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<!--<parameter name=\"field1\" value=\"Path computation succeed!\"/>-->\n<!--<parameter name=\"field2\" value=\"`$ccsdkTopo.resp.solutions_length`\"/>-->\n\n<!--<parameter name=\"field1\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"field2\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"field1\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"field2\" value=\"`$tmp.pce-dst-node`\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1602,\r
-        "y": 2084,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1673.8833312988281,\r
+        "y": 2098,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "aa0b4226.979d68",\r
+        "id": "5bc64c01.f1d944",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamebb`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1566,\r
-        "y": 2165,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1637.8833312988281,\r
+        "y": 2179,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1778233a.2c990d",\r
+        "id": "92b81e5e.75b818",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<parameter name='filenamebb' value=\"`$param-prefix-uni-pnfName[8]`\" />",\r
         "comments": "",\r
-        "x": 1535,\r
-        "y": 2125,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1606.8833312988281,\r
+        "y": 2139,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "abd234d.58ac848",\r
+        "id": "380d57d7.fea4b",\r
         "type": "switchNode",\r
         "name": "switch found-middle-man",\r
         "xml": "<switch test=\"`$found-middle-man`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 188,\r
-        "y": 911,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 259.8833312988281,\r
+        "y": 925,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "1e2b2b53.734fe5",\r
-                "4e1ac306.8f9a04"\r
+                "d4fb18fc.5f1838",\r
+                "f8995511.35102"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e1ac306.8f9a04",\r
+        "id": "f8995511.35102",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 394,\r
-        "y": 889,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 465.8833312988281,\r
+        "y": 903,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "504b4dff.3f7944"\r
+                "2b130822.bbaac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e2b2b53.734fe5",\r
+        "id": "d4fb18fc.5f1838",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 392,\r
-        "y": 944,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 463.8833312988281,\r
+        "y": 958,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "e852f499.d7d47"\r
+                "d3e727a3.fb5608"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "504b4dff.3f7944",\r
+        "id": "2b130822.bbaac8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 549,\r
-        "y": 888,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 620.8833312988281,\r
+        "y": 902,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e852f499.d7d47",\r
+        "id": "d3e727a3.fb5608",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 544,\r
-        "y": 944,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 615.8833312988281,\r
+        "y": 958,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "95ae8b1f.95bdf"\r
+                "bc564ff1.6fc448",\r
+                "26e6024f.524ade"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95ae8b1f.95bdf",\r
+        "id": "bc564ff1.6fc448",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='mmridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 756,\r
-        "y": 947,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 820.88330078125,\r
+        "y": 933,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "6ca655d7.32b94c",\r
-                "71946c21.27e46c"\r
+                "b40c41cb.477e98",\r
+                "98b45503.cbd6b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71946c21.27e46c",\r
+        "id": "98b45503.cbd6b",\r
         "type": "set",\r
         "name": "unset tmp.aai.mmrconnectivity",\r
         "xml": "<set>\n<parameter name='tmp.aai.mmrconnectivity.' value='' />\n",\r
         "comments": "",\r
-        "x": 978,\r
-        "y": 903,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1049.8833312988281,\r
+        "y": 917,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6ca655d7.32b94c",\r
+        "id": "b40c41cb.477e98",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$mmridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 962,\r
-        "y": 947,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1033.8833312988281,\r
+        "y": 961,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "89f1fe8.12eb2"\r
+                "9eec80ed.6cbdc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89f1fe8.12eb2",\r
+        "id": "9eec80ed.6cbdc8",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1145.28564453125,\r
-        "y": 946.82177734375,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1217.1689758300781,\r
+        "y": 960.82177734375,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "c43f8d7b.42f328"\r
+                "ce382b36.485b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c43f8d7b.42f328",\r
+        "id": "ce382b36.485b4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 173,\r
-        "y": 1052,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 244.88333129882812,\r
+        "y": 1066,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "c356b2d1.473de"\r
+                "46c63945.972b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c356b2d1.473de",\r
+        "id": "46c63945.972b4",\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[$mmridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.mmrconnectivity\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 380,\r
-        "y": 1052,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 451.8833312988281,\r
+        "y": 1066,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "7d3aad12.e7729c",\r
-                "445bc622.878b58",\r
-                "a630aaa4.2b5c1"\r
+                "de8e8eee.d3dd18",\r
+                "50fa2e7f.3ee61",\r
+                "680182f7.2b7684"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d3aad12.e7729c",\r
+        "id": "de8e8eee.d3dd18",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 601,\r
-        "y": 1025,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 672.8833312988281,\r
+        "y": 1039,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "29193430.648e5c"\r
+                "d92dcdc3.4a7f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57eaf357.b6c024",\r
+        "id": "f3bd00d1.eaecd",\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": 755,\r
-        "y": 1106,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 826.8833312988281,\r
+        "y": 1120,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e9fd4655.c826d",\r
+        "id": "9ce9cbd5.62a98",\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": 751.0623779296875,\r
-        "y": 1061.8597717285156,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 822.9457092285156,\r
+        "y": 1075.8597717285156,\r
+        "z": "17ebb490.e5413b",\r
         "wires": []\r
     },\r
     {\r
-        "id": "445bc622.878b58",\r
+        "id": "50fa2e7f.3ee61",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 588.490966796875,\r
-        "y": 1061.5740356445312,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 660.3742980957031,\r
+        "y": 1075.5740356445312,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "e9fd4655.c826d"\r
+                "9ce9cbd5.62a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a630aaa4.2b5c1",\r
+        "id": "680182f7.2b7684",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 586,\r
-        "y": 1105,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 657.8833312988281,\r
+        "y": 1119,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "57eaf357.b6c024"\r
+                "f3bd00d1.eaecd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29193430.648e5c",\r
+        "id": "d92dcdc3.4a7f2",\r
         "type": "switchNode",\r
         "name": "switch mmrconn type is LEAF",\r
         "xml": "<switch test=\"`$tmp.aai.mmrconnectivity.vpn-type == 'leaf' `\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 829,\r
-        "y": 1019,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 900.8833312988281,\r
+        "y": 1033,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "152b411b.34753f",\r
-                "c764b7cf.a07508"\r
+                "2e362251.21075e",\r
+                "e383a8c2.7dacf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c764b7cf.a07508",\r
+        "id": "e383a8c2.7dacf8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1035,\r
-        "y": 997,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1106.8833312988281,\r
+        "y": 1011,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "758dd9de.5cdc2"\r
+                "6609acc9.62773c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "152b411b.34753f",\r
+        "id": "2e362251.21075e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1033,\r
-        "y": 1052,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1104.8833312988281,\r
+        "y": 1066,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "eb586f24.4ec9a"\r
+                "3dcdf3fe.a74594"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "758dd9de.5cdc2",\r
+        "id": "6609acc9.62773c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1190,\r
-        "y": 996,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1261.8833312988281,\r
+        "y": 1010,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "eb586f24.4ec9a",\r
+        "id": "3dcdf3fe.a74594",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1185,\r
-        "y": 1052,\r
-        "z": "fb45f2fd.f3f61",\r
+        "x": 1256.8833312988281,\r
+        "y": 1066,\r
+        "z": "17ebb490.e5413b",\r
         "wires": [\r
             [\r
-                "d5e8e6d4.6174b"\r
+                "b34ecdaf.e57d9"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "26e6024f.524ade",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 779,\r
+        "y": 978,\r
+        "z": "17ebb490.e5413b",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "94ffeddc.43efb",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 1587,\r
+        "y": 2241,\r
+        "z": "17ebb490.e5413b",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
index ad56b54..2e4b6b6 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
@@ -1,20 +1,20 @@
 [\r
   {\r
-    "id": "d60c3cf9.321a6",\r
+    "id": "781e35fa.f2e1d4",\r
     "type": "dgstart",\r
     "name": "DGSTART",\r
     "outputs": 1,\r
-    "x": 205.88333129882812,\r
-    "y": 156.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 173.88333129882812,\r
+    "y": 149.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "cce5e3d9.59223"\r
+        "9e11530a.17bcb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cce5e3d9.59223",\r
+    "id": "9e11530a.17bcb",\r
     "type": "service-logic",\r
     "name": "GENERIC-RESOURCE-API ${project.version}",\r
     "module": "GENERIC-RESOURCE-API",\r
@@ -22,7912 +22,8076 @@
     "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": 490.1690216064453,\r
-    "y": 218.12143993377686,\r
-    "z": "7062000.f761",\r
+    "x": 458.1690216064453,\r
+    "y": 211.12143993377686,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "73cbe8fd.7b7b"\r
+        "2b94c108.46c67e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "73cbe8fd.7b7b",\r
+    "id": "2b94c108.46c67e",\r
     "type": "method",\r
     "name": "method cll-vnf-topology-operation-cll-modify",\r
     "xml": "<method rpc='cll-vnf-topology-operation-cll-modify' mode='sync'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 496.3119354248047,\r
-    "y": 302.88336181640625,\r
-    "z": "7062000.f761",\r
+    "x": 464.3119354248047,\r
+    "y": 295.88336181640625,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b5475b4e.9dc8a"\r
+        "fc45d9d.aa25928"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b5475b4e.9dc8a",\r
+    "id": "fc45d9d.aa25928",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 845.8833312988281,\r
-    "y": 361.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 813.8833312988281,\r
+    "y": 354.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "bacceb8f.95926",\r
-        "e0024e9e.57e7f8",\r
-        "6d19a9bc.4fa958"\r
+        "5f20119b.1c25f",\r
+        "440015de.6e018c",\r
+        "7415bdce.bb1424"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bacceb8f.95926",\r
+    "id": "5f20119b.1c25f",\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": 1147.2168273925781,\r
-    "y": 632.8136291503906,\r
-    "z": "7062000.f761",\r
+    "x": 1115.2168273925781,\r
+    "y": 625.8136291503906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e0024e9e.57e7f8",\r
+    "id": "440015de.6e018c",\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": 1168.6452941894531,\r
-    "y": 335.2166442871094,\r
-    "z": "7062000.f761",\r
+    "x": 1136.6452941894531,\r
+    "y": 328.2166442871094,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "dc9a92d7.7dd0c",\r
-        "68404646.133ac8",\r
-        "f6dee010.98fcd"\r
+        "12c8110b.ec9bd7",\r
+        "bbd39d34.8832e",\r
+        "23fc32e8.f22086"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dc9a92d7.7dd0c",\r
+    "id": "12c8110b.ec9bd7",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1393.6452941894531,\r
-    "y": 193.21664428710938,\r
-    "z": "7062000.f761",\r
+    "x": 1361.6452941894531,\r
+    "y": 186.21664428710938,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d1be34ef.26139"\r
+        "61f16e51.c24158"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "68404646.133ac8",\r
+    "id": "bbd39d34.8832e",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1389.1362609863281,\r
-    "y": 262.7906799316406,\r
-    "z": "7062000.f761",\r
+    "x": 1357.1362609863281,\r
+    "y": 255.79067993164062,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c39ebb83.790b68"\r
+        "47248fa2.17d9d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f6dee010.98fcd",\r
+    "id": "23fc32e8.f22086",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1377.6452941894531,\r
-    "y": 309.2166442871094,\r
-    "z": "7062000.f761",\r
+    "x": 1345.6452941894531,\r
+    "y": 302.2166442871094,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f8b91686.4a47a8"\r
+        "cdbbe291.f3553"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6c16fe1b.61251",\r
+    "id": "493ce64.5d5d418",\r
     "type": "comment",\r
     "name": "new for TransportSlicing",\r
     "info": "",\r
     "comments": "",\r
-    "x": 1147.6452941894531,\r
-    "y": 223.21664428710938,\r
-    "z": "7062000.f761",\r
+    "x": 1115.6452941894531,\r
+    "y": 216.21664428710938,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6d19a9bc.4fa958",\r
+    "id": "7415bdce.bb1424",\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": 1135.6452941894531,\r
-    "y": 275.2166442871094,\r
-    "z": "7062000.f761",\r
+    "x": 1103.6452941894531,\r
+    "y": 268.2166442871094,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d1be34ef.26139",\r
+    "id": "61f16e51.c24158",\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": 1633.8833312988281,\r
-    "y": 189.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 1601.8833312988281,\r
+    "y": 182.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "74daedf5.b00d34",\r
-        "3ddd8ea0.9d48e2"\r
+        "58e97c67.87accc",\r
+        "d2e64d43.49ac68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c39ebb83.790b68",\r
+    "id": "47248fa2.17d9d",\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": 1543.9457092285156,\r
-    "y": 265.74310302734375,\r
-    "z": "7062000.f761",\r
+    "x": 1511.9457092285156,\r
+    "y": 258.74310302734375,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f8b91686.4a47a8",\r
+    "id": "cdbbe291.f3553",\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": 1547.8833312988281,\r
-    "y": 309.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 1515.8833312988281,\r
+    "y": 302.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "74daedf5.b00d34",\r
+    "id": "58e97c67.87accc",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1838.8833312988281,\r
-    "y": 226.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 1806.8833312988281,\r
+    "y": 219.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "50897ba7.acdc24"\r
+        "c54a8c68.c345e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3ddd8ea0.9d48e2",\r
+    "id": "d2e64d43.49ac68",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1848.8833312988281,\r
-    "y": 153.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 1816.8833312988281,\r
+    "y": 146.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "50897ba7.acdc24",\r
+    "id": "c54a8c68.c345e",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1831.8833312988281,\r
-    "y": 301.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 1799.8833312988281,\r
+    "y": 294.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "25219f6c.9cf818",\r
-        "166df7f7.8cb52",\r
-        "35f1defb.605572",\r
-        "f67d2f30.77ecd8",\r
-        "2530e84c.0abb78"\r
+        "27adf24c.af1566",\r
+        "31a766ce.e0455a",\r
+        "7436fd76.690054",\r
+        "2b9d3039.23a428",\r
+        "2f2ed9c0.e0663e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e3fc1b13.141158",\r
+    "id": "d2a449e8.f07b58",\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": 2317.883331298828,\r
-    "y": 352.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2285.883331298828,\r
+    "y": 345.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "792e0cb6.295efc",\r
-        "9cda4258.33c028",\r
-        "8ec312be.acb358"\r
+        "41c867c6.b55cd8",\r
+        "84c1b468.c04558",\r
+        "621effb3.a9e918"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "792e0cb6.295efc",\r
+    "id": "41c867c6.b55cd8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2533.883331298828,\r
-    "y": 419.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2501.883331298828,\r
+    "y": 412.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d2a1ae9f.45e878"\r
+        "821dc5ef.6d3aa8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9cda4258.33c028",\r
+    "id": "84c1b468.c04558",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2534.374298095703,\r
-    "y": 319.4573059082031,\r
-    "z": "7062000.f761",\r
+    "x": 2502.374298095703,\r
+    "y": 312.4573059082031,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5f00fc5b.612da4"\r
+        "4a81091b.110a38"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8ec312be.acb358",\r
+    "id": "621effb3.a9e918",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2529.883331298828,\r
-    "y": 368.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2497.883331298828,\r
+    "y": 361.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "24485e5a.4004d2"\r
+        "6269ae05.e67ee8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "25219f6c.9cf818",\r
+    "id": "27adf24c.af1566",\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": 2034.8833312988281,\r
-    "y": 333.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2002.8833312988281,\r
+    "y": 326.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e97f59ea.8d55",\r
-        "e3fc1b13.141158",\r
-        "dca67cc5.30d2f8",\r
-        "ce64f5e6.94469"\r
+        "2c28c5a4.c9fc4a",\r
+        "d2a449e8.f07b58",\r
+        "42097510.f58b64",\r
+        "7a55e6a1.70e4b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e97f59ea.8d55",\r
+    "id": "2c28c5a4.c9fc4a",\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": 2314.883331298828,\r
-    "y": 271.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2282.883331298828,\r
+    "y": 264.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f67d2f30.77ecd8",\r
+    "id": "2b9d3039.23a428",\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": 2008.8833312988281,\r
-    "y": 283.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 1976.8833312988281,\r
+    "y": 276.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "166df7f7.8cb52",\r
+    "id": "31a766ce.e0455a",\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": 2051.883331298828,\r
-    "y": 142.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 2019.8833312988281,\r
+    "y": 135.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "35f1defb.605572",\r
+    "id": "7436fd76.690054",\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": 2063.883331298828,\r
-    "y": 183.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 2031.8833312988281,\r
+    "y": 176.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2302212a.18d7a6",\r
+    "id": "e57021b1.8566f8",\r
     "type": "comment",\r
     "name": "The following two nodes are for PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 2088.883331298828,\r
-    "y": 95.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 2056.883331298828,\r
+    "y": 88.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "67aae728.5fece",\r
+    "id": "f75cee20.f52e5",\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": 2008.8833312988281,\r
-    "y": 229.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 1976.8833312988281,\r
+    "y": 222.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5f00fc5b.612da4",\r
+    "id": "4a81091b.110a38",\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": 2712.883331298828,\r
-    "y": 321.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2680.883331298828,\r
+    "y": 314.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "24485e5a.4004d2",\r
+    "id": "6269ae05.e67ee8",\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": 2712.820831298828,\r
-    "y": 371.0235900878906,\r
-    "z": "7062000.f761",\r
+    "x": 2680.820831298828,\r
+    "y": 364.0235900878906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d2a1ae9f.45e878",\r
+    "id": "821dc5ef.6d3aa8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2714.820831298828,\r
-    "y": 422.0235900878906,\r
-    "z": "7062000.f761",\r
+    "x": 2682.820831298828,\r
+    "y": 415.0235900878906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "61c50290.a54bf4"\r
+        "2337e3a2.faa61c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "61c50290.a54bf4",\r
+    "id": "2337e3a2.faa61c",\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": 3007.820831298828,\r
-    "y": 369.0235900878906,\r
-    "z": "7062000.f761",\r
+    "x": 2975.820831298828,\r
+    "y": 362.0235900878906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d79412d7.a6c38",\r
-        "3f6fbc64.721af4",\r
-        "a6250e3f.f36fa"\r
+        "cccd155c.90e07",\r
+        "b9a7ac6e.7fea5",\r
+        "73057b22.08e1dc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3f6fbc64.721af4",\r
+    "id": "b9a7ac6e.7fea5",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3281.311798095703,\r
-    "y": 261.5975646972656,\r
-    "z": "7062000.f761",\r
+    "x": 3249.311798095703,\r
+    "y": 254.59756469726562,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "16afc6a3.6b5401"\r
+        "e5cee345.1eaae"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "16afc6a3.6b5401",\r
+    "id": "e5cee345.1eaae",\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": 3458.883331298828,\r
-    "y": 261.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3426.883331298828,\r
+    "y": 254.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a6250e3f.f36fa",\r
+    "id": "73057b22.08e1dc",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3276.820831298828,\r
-    "y": 311.0235900878906,\r
-    "z": "7062000.f761",\r
+    "x": 3244.820831298828,\r
+    "y": 304.0235900878906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5cebea40.e205d4"\r
+        "f16a75f9.e23598"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5cebea40.e205d4",\r
+    "id": "f16a75f9.e23598",\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": 3458.820831298828,\r
-    "y": 311.0235900878906,\r
-    "z": "7062000.f761",\r
+    "x": 3426.820831298828,\r
+    "y": 304.0235900878906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d79412d7.a6c38",\r
+    "id": "cccd155c.90e07",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3280.820831298828,\r
-    "y": 362.0235900878906,\r
-    "z": "7062000.f761",\r
+    "x": 3248.820831298828,\r
+    "y": 355.0235900878906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "9ae7a072.d1e518"\r
+        "e05a51c3.eb7208"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9ae7a072.d1e518",\r
+    "id": "e05a51c3.eb7208",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3460.820831298828,\r
-    "y": 362.0235900878906,\r
-    "z": "7062000.f761",\r
+    "x": 3428.820831298828,\r
+    "y": 355.0235900878906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "360b8115.051b46"\r
+        "a185fcaa.c01b7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "360b8115.051b46",\r
+    "id": "a185fcaa.c01b7",\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": 3026.883331298828,\r
-    "y": 496.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2994.883331298828,\r
+    "y": 489.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "28ab4f33.316c8",\r
-        "e49a7d12.f127b"\r
+        "64dc3552.29da24",\r
+        "1cf4e379.2b6355"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e49a7d12.f127b",\r
+    "id": "1cf4e379.2b6355",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3336.883331298828,\r
-    "y": 503.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3304.883331298828,\r
+    "y": 496.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "28ab4f33.316c8",\r
+    "id": "64dc3552.29da24",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3335.883331298828,\r
-    "y": 557.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3303.883331298828,\r
+    "y": 550.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "32ff3e84.f9f78a"\r
+        "49cf9d82.f3816c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ac20a1c4.b5d88",\r
+    "id": "61811a9.92ccce4",\r
     "type": "outcome",\r
     "name": "network-policy",\r
     "xml": "<outcome value='network-policy'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4080.883331298828,\r
-    "y": 511.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4048.883331298828,\r
+    "y": 504.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "eb5b39ae.c0eb7"\r
+        "5422df0.13119a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb5b39ae.c0eb7",\r
+    "id": "5422df0.13119a",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4257.883209228516,\r
-    "y": 504.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 4225.883209228516,\r
+    "y": 497.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c3ea0a96.012838",\r
-        "42443b39.66d044"\r
+        "cc385253.b8fbd",\r
+        "2cd49ffd.326448"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "32ff3e84.f9f78a",\r
+    "id": "49cf9d82.f3816c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3499.883331298828,\r
-    "y": 483.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3467.883331298828,\r
+    "y": 476.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "6034bf74.a356a8",\r
-        "cf462c55.82"\r
+        "f69edc6a.996158",\r
+        "7412251.16d085c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6034bf74.a356a8",\r
+    "id": "f69edc6a.996158",\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": 3780.883331298828,\r
-    "y": 439.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3748.883331298828,\r
+    "y": 432.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "6ceb7138.15694"\r
+        "ed2a485c.4e373"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6ceb7138.15694",\r
+    "id": "ed2a485c.4e373",\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": 4042.883331298828,\r
-    "y": 439.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4010.883331298828,\r
+    "y": 432.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ac20a1c4.b5d88"\r
+        "61811a9.92ccce4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c3ea0a96.012838",\r
+    "id": "cc385253.b8fbd",\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": 4500.883209228516,\r
-    "y": 461.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 4468.883209228516,\r
+    "y": 454.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "42443b39.66d044",\r
+    "id": "2cd49ffd.326448",\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": 4489.883209228516,\r
-    "y": 516.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 4457.883209228516,\r
+    "y": 509.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "cb5892f8.a134a",\r
-        "3110dc42.56e8b4",\r
-        "b948b2e1.478978"\r
+        "9972e623.c70578",\r
+        "34812087.cb8a98",\r
+        "1b373493.bb5393"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b948b2e1.478978",\r
+    "id": "1b373493.bb5393",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4742.883331298828,\r
-    "y": 402.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4710.883331298828,\r
+    "y": 395.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f1bf9a6a.1a4ef8"\r
+        "f7f40cf5.3f9508"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f1bf9a6a.1a4ef8",\r
+    "id": "f7f40cf5.3f9508",\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": 4891.454864501953,\r
-    "y": 403.1690979003906,\r
-    "z": "7062000.f761",\r
+    "x": 4859.454864501953,\r
+    "y": 396.1690979003906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e719bcf6.a15758",\r
+    "id": "a22797f6.37b0d8",\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": 4890.392364501953,\r
-    "y": 447.3093566894531,\r
-    "z": "7062000.f761",\r
+    "x": 4858.392364501953,\r
+    "y": 440.3093566894531,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3110dc42.56e8b4",\r
+    "id": "34812087.cb8a98",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4731.392364501953,\r
-    "y": 447.3093566894531,\r
-    "z": "7062000.f761",\r
+    "x": 4699.392364501953,\r
+    "y": 440.3093566894531,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e719bcf6.a15758"\r
+        "a22797f6.37b0d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cb5892f8.a134a",\r
+    "id": "9972e623.c70578",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4738.392364501953,\r
-    "y": 526.3093566894531,\r
-    "z": "7062000.f761",\r
+    "x": 4706.392364501953,\r
+    "y": 519.3093566894531,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f905d5a0.4b001"\r
+        "2ecc1ca4.45238c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f905d5a0.4b001",\r
+    "id": "2ecc1ca4.45238c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4877.392364501953,\r
-    "y": 526.3093566894531,\r
-    "z": "7062000.f761",\r
+    "x": 4845.392364501953,\r
+    "y": 519.3093566894531,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "abc9ac08.900428",\r
-        "808b62f7.887bc"\r
+        "4189f313.1a9cd4",\r
+        "b78697ee.5ce55"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "abc9ac08.900428",\r
+    "id": "4189f313.1a9cd4",\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": 5082.883331298828,\r
-    "y": 523.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5050.883331298828,\r
+    "y": 516.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "808b62f7.887bc",\r
+    "id": "b78697ee.5ce55",\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": 5081.883331298828,\r
-    "y": 569.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5049.883331298828,\r
+    "y": 562.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cf462c55.82",\r
+    "id": "7412251.16d085c",\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": 3597.883331298828,\r
-    "y": 555.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3565.883331298828,\r
+    "y": 548.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d512c83a.b4f08"\r
+        "6604e9c7.0c6c6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d512c83a.b4f08",\r
+    "id": "6604e9c7.0c6c6",\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": 3877.883331298828,\r
-    "y": 555.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3845.883331298828,\r
+    "y": 548.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7f3fc2f9.da6f6c"\r
+        "85f44348.40e85"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f3fc2f9.da6f6c",\r
+    "id": "85f44348.40e85",\r
     "type": "outcome",\r
     "name": "logical-link",\r
     "xml": "<outcome value='logical-link'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2290.8834533691406,\r
-    "y": 808.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 2258.8834533691406,\r
+    "y": 801.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c5194935.bd2228"\r
+        "4b9c1fcb.91dc9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c5194935.bd2228",\r
+    "id": "4b9c1fcb.91dc9",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2467.883331298828,\r
-    "y": 801.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2435.883331298828,\r
+    "y": 794.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d3179b9f.9873a8",\r
-        "b976f3f3.6f7998"\r
+        "27f44efc.6f6d32",\r
+        "c7edfd64.b3753"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d3179b9f.9873a8",\r
+    "id": "27f44efc.6f6d32",\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": 2710.883331298828,\r
-    "y": 758.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2678.883331298828,\r
+    "y": 751.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b976f3f3.6f7998",\r
+    "id": "c7edfd64.b3753",\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": 2699.883331298828,\r
-    "y": 813.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2667.883331298828,\r
+    "y": 806.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "78ac5925.ecf5a8",\r
-        "b7b22856.252df8",\r
-        "ac6d9ce2.b2e9e"\r
+        "24ace19f.75b966",\r
+        "ac0fada7.2237a",\r
+        "7d46d2c9.4b5f9c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "78ac5925.ecf5a8",\r
+    "id": "24ace19f.75b966",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2991.374298095703,\r
-    "y": 792.4573059082031,\r
-    "z": "7062000.f761",\r
+    "x": 2959.374298095703,\r
+    "y": 785.4573059082031,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "cd49934.02e89f"\r
+        "d7ebe78c.3ec37"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b7b22856.252df8",\r
+    "id": "ac0fada7.2237a",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2979.883331298828,\r
-    "y": 836.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2947.883331298828,\r
+    "y": 829.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ed06d18.02143b"\r
+        "77d529f.fb28458"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cd49934.02e89f",\r
+    "id": "d7ebe78c.3ec37",\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": 3139.945831298828,\r
-    "y": 792.7430725097656,\r
-    "z": "7062000.f761",\r
+    "x": 3107.945831298828,\r
+    "y": 785.7430725097656,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ed06d18.02143b",\r
+    "id": "77d529f.fb28458",\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": 3138.883331298828,\r
-    "y": 836.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3106.883331298828,\r
+    "y": 829.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ac6d9ce2.b2e9e",\r
+    "id": "7d46d2c9.4b5f9c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2986.883331298828,\r
-    "y": 915.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 2954.883331298828,\r
+    "y": 908.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "87f4e9d.ba71598"\r
+        "265410a7.36ec88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "87f4e9d.ba71598",\r
+    "id": "265410a7.36ec88",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3125.883331298828,\r
-    "y": 915.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3093.883331298828,\r
+    "y": 908.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c2cb656b.4adff",\r
-        "148d0b0c.712fa5",\r
-        "d89221fb.e3072",\r
-        "ea9aeb3f.7f8c98",\r
-        "11e605d7.ecd0fa",\r
-        "104f2b87.41fe14",\r
-        "1a00d4a4.ff98a3",\r
-        "59b35d49.e5c194",\r
-        "52e7c1a.b628dc",\r
-        "cdada9b0.2f3a48",\r
-        "850e2800.badf2",\r
-        "2b1064a0.eade7c",\r
-        "a5bcbd5b.23b83",\r
-        "23879b91.f9cdd4"\r
+        "98c1de20.9fd92",\r
+        "22cf748c.dba294",\r
+        "6d145189.478b8",\r
+        "8cce98e.0c8f3e8",\r
+        "d4009f69.0bc89",\r
+        "9190bf27.d61b08",\r
+        "1fa44b37.7a7c65",\r
+        "1ebd0160.929687",\r
+        "f7e98987.293918",\r
+        "6b01ec04.e8e8dc",\r
+        "ce90c6ec.193398",\r
+        "323cec2c.88d45c",\r
+        "fba2883c.72d2",\r
+        "abd6e7f0.9745e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f8061145.abbc7",\r
+    "id": "ec511c6.7493e6",\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": 3439.883331298828,\r
-    "y": 721.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3407.883331298828,\r
+    "y": 714.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c2cb656b.4adff",\r
+    "id": "98c1de20.9fd92",\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": 3420.883331298828,\r
-    "y": 771.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3388.883331298828,\r
+    "y": 764.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "23879b91.f9cdd4",\r
+    "id": "abd6e7f0.9745e8",\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": 3377.883331298828,\r
-    "y": 816.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3345.883331298828,\r
+    "y": 809.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "148d0b0c.712fa5",\r
+    "id": "22cf748c.dba294",\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": 3352.883331298828,\r
-    "y": 879.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3320.883331298828,\r
+    "y": 872.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d89221fb.e3072",\r
+    "id": "6d145189.478b8",\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": 3353.883331298828,\r
-    "y": 934.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3321.883331298828,\r
+    "y": 927.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ea9aeb3f.7f8c98",\r
+    "id": "8cce98e.0c8f3e8",\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": 3369.883331298828,\r
-    "y": 982.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3337.883331298828,\r
+    "y": 975.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "842b0094.75a4a",\r
-        "7eb2f3df.e44f04",\r
-        "b07921bb.e3808"\r
+        "909d17c4.8ebc6",\r
+        "f19af18e.9ab1b8",\r
+        "7d20c22a.cc52a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "11e605d7.ecd0fa",\r
+    "id": "d4009f69.0bc89",\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": 3358.883331298828,\r
-    "y": 1069.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 3326.883331298828,\r
+    "y": 1062.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "2d5fb508.bfab52",\r
-        "cb29efc.c6f4b1",\r
-        "61b86bd0.897d5c"\r
+        "9444273f.3b6308",\r
+        "2c5b38f8.57c148",\r
+        "b9db8112.11ed58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "842b0094.75a4a",\r
+    "id": "909d17c4.8ebc6",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3570.883331298828,\r
-    "y": 866.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3538.883331298828,\r
+    "y": 859.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "20684afd.b6d766"\r
+        "c14b1c12.22174"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7eb2f3df.e44f04",\r
+    "id": "f19af18e.9ab1b8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3566.392364501953,\r
-    "y": 916.3093566894531,\r
-    "z": "7062000.f761",\r
+    "x": 3534.392364501953,\r
+    "y": 909.3093566894531,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d2041960.fe2c28"\r
+        "2b40f083.4de84"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b07921bb.e3808",\r
+    "id": "7d20c22a.cc52a4",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3570.392364501953,\r
-    "y": 969.3093566894531,\r
-    "z": "7062000.f761",\r
+    "x": 3538.392364501953,\r
+    "y": 962.3093566894531,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f96f84b2.606d"\r
+        "aaa35683.7d2c38"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "20684afd.b6d766",\r
+    "id": "c14b1c12.22174",\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": 3719.454864501953,\r
-    "y": 866.1690979003906,\r
-    "z": "7062000.f761",\r
+    "x": 3687.454864501953,\r
+    "y": 859.1690979003906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d2041960.fe2c28",\r
+    "id": "2b40f083.4de84",\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": 3709.392364501953,\r
-    "y": 916.3093566894531,\r
-    "z": "7062000.f761",\r
+    "x": 3677.392364501953,\r
+    "y": 909.3093566894531,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2d5fb508.bfab52",\r
+    "id": "9444273f.3b6308",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3581.883331298828,\r
-    "y": 1039.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 3549.883331298828,\r
+    "y": 1032.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "96baba9a.d0e19"\r
+        "106ff1ef.63ffd6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cb29efc.c6f4b1",\r
+    "id": "2c5b38f8.57c148",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3577.392364501953,\r
-    "y": 1089.3092346191406,\r
-    "z": "7062000.f761",\r
+    "x": 3545.392364501953,\r
+    "y": 1082.3092346191406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "1fb34f72.484a51"\r
+        "ce83157c.4b6778"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "61b86bd0.897d5c",\r
+    "id": "b9db8112.11ed58",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3578.392364501953,\r
-    "y": 1142.3092346191406,\r
-    "z": "7062000.f761",\r
+    "x": 3546.392364501953,\r
+    "y": 1135.3092346191406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "10c44aa8.1e2ead"\r
+        "a56ebadb.ee398"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "96baba9a.d0e19",\r
+    "id": "106ff1ef.63ffd6",\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": 3730.454864501953,\r
-    "y": 1039.1689758300781,\r
-    "z": "7062000.f761",\r
+    "x": 3698.454864501953,\r
+    "y": 1032.1689758300781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1fb34f72.484a51",\r
+    "id": "ce83157c.4b6778",\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": 3720.392364501953,\r
-    "y": 1089.3092346191406,\r
-    "z": "7062000.f761",\r
+    "x": 3688.392364501953,\r
+    "y": 1082.3092346191406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f96f84b2.606d",\r
+    "id": "aaa35683.7d2c38",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3731.883331298828,\r
-    "y": 968.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3699.883331298828,\r
+    "y": 961.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c276b776.1eb8a"\r
+        "bc98fef2.b2548"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "10c44aa8.1e2ead",\r
+    "id": "a56ebadb.ee398",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3731.883331298828,\r
-    "y": 1141.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 3699.883331298828,\r
+    "y": 1134.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "dfc4c0e1.407a7"\r
+        "80324f63.fa516"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c276b776.1eb8a",\r
+    "id": "bc98fef2.b2548",\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": 3903.883331298828,\r
-    "y": 968.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3871.883331298828,\r
+    "y": 961.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "680276dd.9e09b8",\r
-        "fada4cff.fbd328"\r
+        "49900721.03dea8",\r
+        "7a97b419.9c3254"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dfc4c0e1.407a7",\r
+    "id": "80324f63.fa516",\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": 3904.883331298828,\r
-    "y": 1141.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3872.883331298828,\r
+    "y": 1134.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "1f020e0e.66975a",\r
-        "a14ce01a.56f21"\r
+        "9dd66c65.827358",\r
+        "1559fb7e.bddfc5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "680276dd.9e09b8",\r
+    "id": "49900721.03dea8",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4079.883331298828,\r
-    "y": 947.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4047.883331298828,\r
+    "y": 940.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "2d74202a.0b02c"\r
+        "9c76efc2.c7f458"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fada4cff.fbd328",\r
+    "id": "7a97b419.9c3254",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4081.883331298828,\r
-    "y": 1001.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4049.883331298828,\r
+    "y": 994.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7e647400.994a6c"\r
+        "36b200ce.3626f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1f020e0e.66975a",\r
+    "id": "9dd66c65.827358",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4080.883331298828,\r
-    "y": 1111.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4048.883331298828,\r
+    "y": 1104.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "45ecb3a3.4434cc"\r
+        "f7a8d104.b779c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a14ce01a.56f21",\r
+    "id": "1559fb7e.bddfc5",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4082.883331298828,\r
-    "y": 1165.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4050.883331298828,\r
+    "y": 1158.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c83b931a.caa288"\r
+        "2781339a.2c9d8c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "698ac3d0.bab4ec",\r
+    "id": "a64deb38.79c21",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4389.883331298828,\r
-    "y": 899.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4357.883331298828,\r
+    "y": 892.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d12533f5.293ec",\r
+    "id": "d00069b9.08211",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4382.883331298828,\r
-    "y": 997.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4350.883331298828,\r
+    "y": 990.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cfe2458d.e53598",\r
+    "id": "e2a3248.b77d4d8",\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": 4382.883331298828,\r
-    "y": 1084.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4350.883331298828,\r
+    "y": 1077.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e0154f38.db2ba",\r
+    "id": "69fc971e.d1c948",\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": 4386.883331298828,\r
-    "y": 1177.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4354.883331298828,\r
+    "y": 1170.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c5ef28c0.6623d",\r
+    "id": "79a28b11.e62b74",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3613.883331298828,\r
-    "y": 1586.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3581.883331298828,\r
+    "y": 1579.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "cf149009.40de5"\r
+        "4a634c2c.1a75ec"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "892e385b.99fcd8",\r
+    "id": "940be839.4c9f2",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3623.374298095703,\r
-    "y": 1629.4573669433594,\r
-    "z": "7062000.f761",\r
+    "x": 3591.374298095703,\r
+    "y": 1622.4573669433594,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "fcd9fb7.509ae08"\r
+        "87a8481c.69d658"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a241b92b.410968",\r
+    "id": "a420af0c.05d778",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3611.883331298828,\r
-    "y": 1675.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3579.883331298828,\r
+    "y": 1668.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "3987c181.ee8c26"\r
+        "2583b063.d99b38"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "277d69d7.fb78d6",\r
+    "id": "2f08f142.24c856",\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": 3313.883331298828,\r
-    "y": 1548.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3281.883331298828,\r
+    "y": 1541.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1a00d4a4.ff98a3",\r
+    "id": "1fa44b37.7a7c65",\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": 3356.883331298828,\r
-    "y": 1613.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3324.883331298828,\r
+    "y": 1606.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c5ef28c0.6623d",\r
-        "892e385b.99fcd8",\r
-        "a241b92b.410968"\r
+        "79a28b11.e62b74",\r
+        "940be839.4c9f2",\r
+        "a420af0c.05d778"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "104f2b87.41fe14",\r
+    "id": "9190bf27.d61b08",\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": 3357.883331298828,\r
-    "y": 1283.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3325.883331298828,\r
+    "y": 1276.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a533cbf2.9ff568",\r
-        "84397dc4.6052e8"\r
+        "d3643022.187b08",\r
+        "f8e2bf22.0eeef"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "84397dc4.6052e8",\r
+    "id": "f8e2bf22.0eeef",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3580.883331298828,\r
-    "y": 1269.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3548.883331298828,\r
+    "y": 1262.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a3186923.403f7"\r
+        "624eaece.91144"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a533cbf2.9ff568",\r
+    "id": "d3643022.187b08",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3582.883331298828,\r
-    "y": 1302.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3550.883331298828,\r
+    "y": 1295.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "fb4a8c19.28b8c8"\r
+        "c2708361.dc58a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cf149009.40de5",\r
+    "id": "4a634c2c.1a75ec",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3786.549835205078,\r
-    "y": 1585.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3754.549835205078,\r
+    "y": 1578.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d71c8cc2.44ee38",\r
-        "eeee90c0.e5cea8"\r
+        "a3465897.dfb6c",\r
+        "6701a8e7.d232d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fcd9fb7.509ae08",\r
+    "id": "87a8481c.69d658",\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": 3776.9457092285156,\r
-    "y": 1632.7431030273438,\r
-    "z": "7062000.f761",\r
+    "x": 3744.9457092285156,\r
+    "y": 1625.7431030273438,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3987c181.ee8c26",\r
+    "id": "2583b063.d99b38",\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": 3780.883331298828,\r
-    "y": 1676.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3748.883331298828,\r
+    "y": 1669.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d71c8cc2.44ee38",\r
+    "id": "a3465897.dfb6c",\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": 4050.883331298828,\r
-    "y": 1569.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4018.883331298828,\r
+    "y": 1562.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "245c145e.ebe6e4",\r
-        "5de5cc75.c2e844"\r
+        "345ba8bf.bbff3",\r
+        "cd05726a.f82838"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5de5cc75.c2e844",\r
+    "id": "cd05726a.f82838",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4273.883331298828,\r
-    "y": 1524.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4241.883331298828,\r
+    "y": 1517.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a0f9be9b.313468"\r
+        "2d1297aa.955328"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "245c145e.ebe6e4",\r
+    "id": "345ba8bf.bbff3",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4275.883331298828,\r
-    "y": 1588.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4243.883331298828,\r
+    "y": 1581.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "911806e7.142508"\r
+        "c1965743.4c3d48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "911806e7.142508",\r
+    "id": "c1965743.4c3d48",\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": 4437.883331298828,\r
-    "y": 1584.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4405.883331298828,\r
+    "y": 1577.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a0f9be9b.313468",\r
+    "id": "2d1297aa.955328",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4438.883331298828,\r
-    "y": 1521.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4406.883331298828,\r
+    "y": 1514.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e1f125c0.caa6f",\r
-        "a1eca114.4be78"\r
+        "2cdfacb5.3a35a4",\r
+        "3e9d9121.36c9d6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d95b965d.c926c",\r
+    "id": "8deb3478.19bbc8",\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": 4052.883331298828,\r
-    "y": 1728.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4020.883331298828,\r
+    "y": 1721.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6b95fc34.5ad8b4",\r
+    "id": "97704f04.65be9",\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": 4097.883331298828,\r
-    "y": 1638.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4065.883331298828,\r
+    "y": 1631.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8335544a.4f7eb",\r
+    "id": "d3e16022.86087",\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": 4180.883331298828,\r
-    "y": 1776.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4148.883331298828,\r
+    "y": 1769.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fb4a8c19.28b8c8",\r
+    "id": "c2708361.dc58a8",\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": 3725.883331298828,\r
-    "y": 1299.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3693.883331298828,\r
+    "y": 1292.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a3186923.403f7",\r
+    "id": "624eaece.91144",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3728.883331298828,\r
-    "y": 1262.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3696.883331298828,\r
+    "y": 1255.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "df51c615.6dea38",\r
-        "42564be7.1576fc"\r
+        "72c971d0.4048b8",\r
+        "afa94a20.a982b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "df51c615.6dea38",\r
+    "id": "72c971d0.4048b8",\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": 3902.883331298828,\r
-    "y": 1218.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3870.883331298828,\r
+    "y": 1211.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "eeee90c0.e5cea8",\r
+    "id": "6701a8e7.d232d8",\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": 4004.883331298828,\r
-    "y": 1853.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3972.883331298828,\r
+    "y": 1846.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "1b697bac.74bf24"\r
+        "db5b6ad5.7610d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1b697bac.74bf24",\r
+    "id": "db5b6ad5.7610d",\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": 4210.883331298828,\r
-    "y": 1853.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4178.883331298828,\r
+    "y": 1846.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "fad81e7.f76f06"\r
+        "91f60d7.c7d4bf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fad81e7.f76f06",\r
+    "id": "91f60d7.c7d4bf",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4426.168975830078,\r
-    "y": 1853.7051086425781,\r
-    "z": "7062000.f761",\r
+    "x": 4394.168975830078,\r
+    "y": 1846.7051086425781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f6db1963.f8cc08"\r
+        "f6e4c256.99ed68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "42564be7.1576fc",\r
+    "id": "afa94a20.a982b",\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": 3917.883331298828,\r
-    "y": 1329.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3885.883331298828,\r
+    "y": 1322.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "3d26932b.7c3bc4",\r
-        "11ea41e8.6fef1e",\r
-        "60ff709f.49eb3"\r
+        "1979ced2.4d0299",\r
+        "9890a5f2.a73b18",\r
+        "d6c935ad.2c18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3d26932b.7c3bc4",\r
+    "id": "1979ced2.4d0299",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4113.383453369141,\r
-    "y": 1281.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4081.3834533691406,\r
+    "y": 1274.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e66646fd.ae97a8"\r
+        "d4f7d32a.177f28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "11ea41e8.6fef1e",\r
+    "id": "9890a5f2.a73b18",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4105.383453369141,\r
-    "y": 1336.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4073.3834533691406,\r
+    "y": 1329.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "6bc38e9e.a8f668"\r
+        "4c3f3b2.6283544"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "60ff709f.49eb3",\r
+    "id": "d6c935ad.2c18",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4110.383453369141,\r
-    "y": 1393.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4078.3834533691406,\r
+    "y": 1386.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "1b2700d2.65979f"\r
+        "13564645.a1e6da"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1b2700d2.65979f",\r
+    "id": "13564645.a1e6da",\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": 4262.383453369141,\r
-    "y": 1394.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4230.383453369141,\r
+    "y": 1387.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6bc38e9e.a8f668",\r
+    "id": "4c3f3b2.6283544",\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": 4273.383453369141,\r
-    "y": 1339.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4241.383453369141,\r
+    "y": 1332.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e66646fd.ae97a8",\r
+    "id": "d4f7d32a.177f28",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4257.765777587891,\r
-    "y": 1279.5390014648438,\r
-    "z": "7062000.f761",\r
+    "x": 4225.765777587891,\r
+    "y": 1272.5390014648438,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "8c7c1f5.e4db1e"\r
+        "755f8d33.dd06bc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8c7c1f5.e4db1e",\r
+    "id": "755f8d33.dd06bc",\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": 4441.883331298828,\r
-    "y": 1293.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4409.883331298828,\r
+    "y": 1286.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "9be30f1d.25d3a8"\r
+        "910fe315.8317e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a1eca114.4be78",\r
+    "id": "3e9d9121.36c9d6",\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": 4608.883331298828,\r
-    "y": 1479.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4576.883331298828,\r
+    "y": 1472.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e1f125c0.caa6f",\r
+    "id": "2cdfacb5.3a35a4",\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": 4609.883331298828,\r
-    "y": 1587.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4577.883331298828,\r
+    "y": 1580.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b9cba76c.d9c1f8",\r
+    "id": "80df0a60.dec0f8",\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": 4610.883331298828,\r
-    "y": 1536.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4578.883331298828,\r
+    "y": 1529.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f6db1963.f8cc08",\r
+    "id": "f6e4c256.99ed68",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4633.000518798828,\r
-    "y": 1854.2236633300781,\r
-    "z": "7062000.f761",\r
+    "x": 4601.000518798828,\r
+    "y": 1847.2236633300781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7891783a.b17838",\r
-        "d094659a.049558",\r
-        "9c226fb0.3cc118"\r
+        "a4a05745.968c7",\r
+        "d1e00a0e.d2e56",\r
+        "d1a2356d.4786a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7891783a.b17838",\r
+    "id": "a4a05745.968c7",\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": 4848.000518798828,\r
-    "y": 1816.2236633300781,\r
-    "z": "7062000.f761",\r
+    "x": 4816.000518798828,\r
+    "y": 1809.2236633300781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d094659a.049558",\r
+    "id": "d1e00a0e.d2e56",\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": 4845.000518798828,\r
-    "y": 1855.2236633300781,\r
-    "z": "7062000.f761",\r
+    "x": 4813.000518798828,\r
+    "y": 1848.2236633300781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7580173.08b9968"\r
+        "17a4f2c1.f6b375"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9c226fb0.3cc118",\r
+    "id": "d1a2356d.4786a8",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4800.500518798828,\r
-    "y": 1897.2236633300781,\r
-    "z": "7062000.f761",\r
+    "x": 4768.500518798828,\r
+    "y": 1890.2236633300781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7580173.08b9968",\r
+    "id": "17a4f2c1.f6b375",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5025.500518798828,\r
-    "y": 1854.2236633300781,\r
-    "z": "7062000.f761",\r
+    "x": 4993.500518798828,\r
+    "y": 1847.2236633300781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "cbf832f4.29b03"\r
+        "ba138e8e.753b68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c301ea5d.736948",\r
+    "id": "8d6faffb.891c08",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4839.883331298828,\r
-    "y": 1297.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4807.883331298828,\r
+    "y": 1290.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "82c12c36.ef82a"\r
+        "17552ef5.2956f9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "82c12c36.ef82a",\r
+    "id": "17552ef5.2956f9",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5016.883331298828,\r
-    "y": 1289.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4984.883331298828,\r
+    "y": 1282.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "99af67bd.f0a288",\r
-        "27aaa5b6.e5d6a2"\r
+        "55d02530.edc7ec",\r
+        "14cede7e.dd48aa"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9be30f1d.25d3a8",\r
+    "id": "910fe315.8317e8",\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": 4636.883331298828,\r
-    "y": 1293.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4604.883331298828,\r
+    "y": 1286.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c301ea5d.736948",\r
-        "d642ceb0.6d61d8"\r
+        "8d6faffb.891c08",\r
+        "fe294daa.41d368"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d642ceb0.6d61d8",\r
+    "id": "fe294daa.41d368",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4842.883331298828,\r
-    "y": 1371.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4810.883331298828,\r
+    "y": 1364.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "8d64b35.e02ce5"\r
+        "d9a2dd9b.e37c68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8d64b35.e02ce5",\r
+    "id": "d9a2dd9b.e37c68",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5019.883331298828,\r
-    "y": 1363.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4987.883331298828,\r
+    "y": 1356.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b7238960.567a78"\r
+        "7ccc9bf1.00634c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cbf832f4.29b03",\r
+    "id": "ba138e8e.753b68",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5183.500518798828,\r
-    "y": 1854.2236633300781,\r
-    "z": "7062000.f761",\r
+    "x": 5151.500518798828,\r
+    "y": 1847.2236633300781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "703f7e18.3396c8"\r
+        "949f2da8.99048"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "703f7e18.3396c8",\r
+    "id": "949f2da8.99048",\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": 5390.500518798828,\r
-    "y": 1854.2236633300781,\r
-    "z": "7062000.f761",\r
+    "x": 5358.500518798828,\r
+    "y": 1847.2236633300781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "27aaa5b6.e5d6a2",\r
+    "id": "14cede7e.dd48aa",\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": 5224.883331298828,\r
-    "y": 1296.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5192.883331298828,\r
+    "y": 1289.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5f4852b0.deaefc",\r
-        "a3e152bc.1612f",\r
-        "6a748238.68a734"\r
+        "b2a3145.b7edbe8",\r
+        "e74729d.3422f58",\r
+        "409c0b0b.c89e64"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "99af67bd.f0a288",\r
+    "id": "55d02530.edc7ec",\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": 5254.883331298828,\r
-    "y": 1244.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5222.883331298828,\r
+    "y": 1237.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5f4852b0.deaefc",\r
+    "id": "b2a3145.b7edbe8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5434.883331298828,\r
-    "y": 1287.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5402.883331298828,\r
+    "y": 1280.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "fce8f611.8c7338"\r
+        "4b8f6adb.6d0404"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a3e152bc.1612f",\r
+    "id": "e74729d.3422f58",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5426.883331298828,\r
-    "y": 1342.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5394.883331298828,\r
+    "y": 1335.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "23b3b244.7d6476"\r
+        "19136c8e.dcdfbb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6a748238.68a734",\r
+    "id": "409c0b0b.c89e64",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5431.883331298828,\r
-    "y": 1399.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5399.883331298828,\r
+    "y": 1392.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a282f316.3a8968"\r
+        "e2070656.8dd03"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a282f316.3a8968",\r
+    "id": "e2070656.8dd03",\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": 5583.883331298828,\r
-    "y": 1400.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5551.883331298828,\r
+    "y": 1393.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "23b3b244.7d6476",\r
+    "id": "19136c8e.dcdfbb",\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": 5594.883331298828,\r
-    "y": 1345.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5562.883331298828,\r
+    "y": 1338.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fce8f611.8c7338",\r
+    "id": "4b8f6adb.6d0404",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5579.265655517578,\r
-    "y": 1285.5390014648438,\r
-    "z": "7062000.f761",\r
+    "x": 5547.265655517578,\r
+    "y": 1278.5390014648438,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a440aece.fb083"\r
+        "c2a5af15.443d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b7238960.567a78",\r
+    "id": "7ccc9bf1.00634c",\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": 5254.883331298828,\r
-    "y": 1487.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5222.883331298828,\r
+    "y": 1480.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a440aece.fb083",\r
+    "id": "c2a5af15.443d8",\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": 5793.883331298828,\r
-    "y": 1281.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 5761.883331298828,\r
+    "y": 1274.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5b9ee810.250ef",\r
+    "id": "4eba14c8.80a994",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4377.883331298828,\r
-    "y": 935.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4345.883331298828,\r
+    "y": 928.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8e2d81c0.4fd7e8",\r
+    "id": "620253a.9c2552c",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4368.883331298828,\r
-    "y": 1033.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4336.883331298828,\r
+    "y": 1026.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2d74202a.0b02c",\r
+    "id": "9c76efc2.c7f458",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4202.883331298828,\r
-    "y": 941.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4170.883331298828,\r
+    "y": 934.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "698ac3d0.bab4ec",\r
-        "5b9ee810.250ef"\r
+        "a64deb38.79c21",\r
+        "4eba14c8.80a994"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7e647400.994a6c",\r
+    "id": "36b200ce.3626f",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4208.883331298828,\r
-    "y": 1005.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4176.883331298828,\r
+    "y": 998.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d12533f5.293ec",\r
-        "8e2d81c0.4fd7e8"\r
+        "d00069b9.08211",\r
+        "620253a.9c2552c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "45ecb3a3.4434cc",\r
+    "id": "f7a8d104.b779c8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4208.883331298828,\r
-    "y": 1111.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4176.883331298828,\r
+    "y": 1104.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "cfe2458d.e53598",\r
-        "1ea1c70f.8279e9"\r
+        "e2a3248.b77d4d8",\r
+        "bcbbe769.3c0e1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c83b931a.caa288",\r
+    "id": "2781339a.2c9d8c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4211.883331298828,\r
-    "y": 1164.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4179.883331298828,\r
+    "y": 1157.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e0154f38.db2ba",\r
-        "85671ae.a18b1e8"\r
+        "69fc971e.d1c948",\r
+        "6070cd17.b28d74"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1ea1c70f.8279e9",\r
+    "id": "bcbbe769.3c0e1",\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": 4368.883331298828,\r
-    "y": 1124.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4336.883331298828,\r
+    "y": 1117.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "85671ae.a18b1e8",\r
+    "id": "6070cd17.b28d74",\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": 4371.883331298828,\r
-    "y": 1215.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4339.883331298828,\r
+    "y": 1208.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7278edf2.b8b58c",\r
+    "id": "ef6aaa0a.46635",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3743.883331298828,\r
-    "y": 2425.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3711.883331298828,\r
+    "y": 2418.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "3fae525c.90658e",\r
-        "13c312d5.234edd"\r
+        "a10bbf1c.524bd",\r
+        "27427337.3be9a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2fa6509a.e12468",\r
+    "id": "a6501243.d121f",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3571.216827392578,\r
-    "y": 2426.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3539.216827392578,\r
+    "y": 2419.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7278edf2.b8b58c"\r
+        "ef6aaa0a.46635"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2125c96e.09934e",\r
+    "id": "aaec6d99.4c304",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3580.707794189453,\r
-    "y": 2469.4573669433594,\r
-    "z": "7062000.f761",\r
+    "x": 3548.707794189453,\r
+    "y": 2462.4573669433594,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "68c9e27f.22495c"\r
+        "47f8697d.df9998"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be5c9f7d.6c274",\r
+    "id": "e6e0568a.7d4f68",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3569.216827392578,\r
-    "y": 2515.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3537.216827392578,\r
+    "y": 2508.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "dc663a75.10e1e"\r
+        "2963b336.e3bc8c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "68c9e27f.22495c",\r
+    "id": "47f8697d.df9998",\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": 3734.2792053222656,\r
-    "y": 2472.7431030273438,\r
-    "z": "7062000.f761",\r
+    "x": 3702.2792053222656,\r
+    "y": 2465.7431030273438,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dc663a75.10e1e",\r
+    "id": "2963b336.e3bc8c",\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": 3738.216827392578,\r
-    "y": 2516.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3706.216827392578,\r
+    "y": 2509.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3fae525c.90658e",\r
+    "id": "a10bbf1c.524bd",\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": 4030.216827392578,\r
-    "y": 2429.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 3998.216827392578,\r
+    "y": 2422.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f8506393.ef4d48",\r
-        "ae1a7fe2.9ff988"\r
+        "b2433bfc.a285b",\r
+        "e32efd70.259f3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ae1a7fe2.9ff988",\r
+    "id": "e32efd70.259f3",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4253.216827392578,\r
-    "y": 2384.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4221.216827392578,\r
+    "y": 2377.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "bd5252ed.d0e86"\r
+        "e33d7c06.1215a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f8506393.ef4d48",\r
+    "id": "b2433bfc.a285b",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4255.216827392578,\r
-    "y": 2448.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4223.216827392578,\r
+    "y": 2441.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7b56fdc4.718894"\r
+        "96c9f851.720ff"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7b56fdc4.718894",\r
+    "id": "96c9f851.720ff",\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": 4414.216827392578,\r
-    "y": 2467.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4382.216827392578,\r
+    "y": 2460.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bd5252ed.d0e86",\r
+    "id": "e33d7c06.1215a",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4418.216827392578,\r
-    "y": 2381.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4386.216827392578,\r
+    "y": 2374.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a04df249.3edf9",\r
-        "4445456b.4ef0dc"\r
+        "64140131.87f6a",\r
+        "d9669ac1.5a2d68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dfb0d610.c67228",\r
+    "id": "e5d24864.c4d21",\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": 4032.216827392578,\r
-    "y": 2588.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4000.216827392578,\r
+    "y": 2581.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a9b19647.ecdf6",\r
+    "id": "f6b5343f.392d9",\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": 4077.216827392578,\r
-    "y": 2498.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4045.216827392578,\r
+    "y": 2491.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d1080dc6.5d411",\r
+    "id": "cfe86ca7.011b18",\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": 4159.216827392578,\r
-    "y": 2653.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4127.216827392578,\r
+    "y": 2646.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "52e7c1a.b628dc",\r
+    "id": "f7e98987.293918",\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": 3343.216827392578,\r
-    "y": 2461.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3311.216827392578,\r
+    "y": 2454.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "2fa6509a.e12468",\r
-        "2125c96e.09934e",\r
-        "be5c9f7d.6c274"\r
+        "a6501243.d121f",\r
+        "aaec6d99.4c304",\r
+        "e6e0568a.7d4f68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "534c4b07.5a4374",\r
+    "id": "d0c5015f.630ad",\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": 3304.216827392578,\r
-    "y": 2405.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3272.216827392578,\r
+    "y": 2398.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "59b35d49.e5c194",\r
+    "id": "1ebd0160.929687",\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": 3361.216827392578,\r
-    "y": 2124.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 3329.216827392578,\r
+    "y": 2117.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "8468812d.ab7d98",\r
-        "832feae1.441b18"\r
+        "28ff08ce.889b38",\r
+        "1b36a02a.8e3468"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "832feae1.441b18",\r
+    "id": "1b36a02a.8e3468",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3584.216827392578,\r
-    "y": 2110.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 3552.216827392578,\r
+    "y": 2103.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "45b67ba7.081314"\r
+        "314f424e.949456"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8468812d.ab7d98",\r
+    "id": "28ff08ce.889b38",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3586.216827392578,\r
-    "y": 2143.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 3554.216827392578,\r
+    "y": 2136.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "71974a85.bc9554"\r
+        "c351a018.b67f98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "71974a85.bc9554",\r
+    "id": "c351a018.b67f98",\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": 3729.216827392578,\r
-    "y": 2140.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 3697.216827392578,\r
+    "y": 2133.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "45b67ba7.081314",\r
+    "id": "314f424e.949456",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3732.216827392578,\r
-    "y": 2103.8832092285156,\r
-    "z": "7062000.f761",\r
+    "x": 3700.216827392578,\r
+    "y": 2096.8832092285156,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "10560f97.9ccdb",\r
-        "fb974250.3eaa5"\r
+        "8065ca34.19e0e",\r
+        "27c4c436.c4a394"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "10560f97.9ccdb",\r
+    "id": "8065ca34.19e0e",\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": 3926.216827392578,\r
-    "y": 2106.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3894.216827392578,\r
+    "y": 2099.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "13c312d5.234edd",\r
+    "id": "27427337.3be9a4",\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": 3989.216827392578,\r
-    "y": 2738.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3957.216827392578,\r
+    "y": 2731.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "4f9cbec5.496d9"\r
+        "b95f783a.80c45"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4f9cbec5.496d9",\r
+    "id": "b95f783a.80c45",\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": 4195.216827392578,\r
-    "y": 2738.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4163.216827392578,\r
+    "y": 2731.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b238117c.f6854"\r
+        "fdd7c5c3.71bfe8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b238117c.f6854",\r
+    "id": "fdd7c5c3.71bfe8",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4412.502471923828,\r
-    "y": 2737.705108642578,\r
-    "z": "7062000.f761",\r
+    "x": 4380.502471923828,\r
+    "y": 2730.705108642578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "3bbc3c62.de1f1c"\r
+        "240f5a27.c1a7a6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fb974250.3eaa5",\r
+    "id": "27c4c436.c4a394",\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": 3948.216827392578,\r
-    "y": 2174.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3916.216827392578,\r
+    "y": 2167.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "8b8a9b87.c8a068",\r
-        "46f3b355.657d1c",\r
-        "789bb9ae.3c411"\r
+        "47b31581.268b0c",\r
+        "43867bdb.1b0d54",\r
+        "bbdefe01.0e663"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8b8a9b87.c8a068",\r
+    "id": "47b31581.268b0c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4143.716949462891,\r
-    "y": 2126.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4111.716949462891,\r
+    "y": 2119.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "288864eb.075f34"\r
+        "bdcfd968.805c18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "46f3b355.657d1c",\r
+    "id": "43867bdb.1b0d54",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4135.716949462891,\r
-    "y": 2181.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4103.716949462891,\r
+    "y": 2174.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f82ba322.6474e"\r
+        "a95a4d5b.d3114"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "789bb9ae.3c411",\r
+    "id": "bbdefe01.0e663",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4140.716949462891,\r
-    "y": 2238.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4108.716949462891,\r
+    "y": 2231.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "98f52488.0327b8"\r
+        "64398d6f.e5c684"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "98f52488.0327b8",\r
+    "id": "64398d6f.e5c684",\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": 4292.716949462891,\r
-    "y": 2239.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4260.716949462891,\r
+    "y": 2232.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f82ba322.6474e",\r
+    "id": "a95a4d5b.d3114",\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": 4303.716949462891,\r
-    "y": 2184.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4271.716949462891,\r
+    "y": 2177.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "288864eb.075f34",\r
+    "id": "bdcfd968.805c18",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4288.099273681641,\r
-    "y": 2124.5390014648438,\r
-    "z": "7062000.f761",\r
+    "x": 4256.099273681641,\r
+    "y": 2117.5390014648438,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ce45d16c.d5e628"\r
+        "6d52f6e9.bcbf28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a04df249.3edf9",\r
+    "id": "64140131.87f6a",\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": 4588.216827392578,\r
-    "y": 2342.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4556.216827392578,\r
+    "y": 2335.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4445456b.4ef0dc",\r
+    "id": "d9669ac1.5a2d68",\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": 4589.216827392578,\r
-    "y": 2447.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4557.216827392578,\r
+    "y": 2440.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c559d0ff.64e92",\r
+    "id": "9ddf3bf9.57ff3",\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": 4584.216827392578,\r
-    "y": 2396.8834533691406,\r
-    "z": "7062000.f761",\r
+    "x": 4552.216827392578,\r
+    "y": 2389.8834533691406,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3bbc3c62.de1f1c",\r
+    "id": "240f5a27.c1a7a6",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4619.334014892578,\r
-    "y": 2727.2237854003906,\r
-    "z": "7062000.f761",\r
+    "x": 4587.334014892578,\r
+    "y": 2720.2237854003906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f4fc0b3b.90cef8",\r
-        "6738a6d1.eac328",\r
-        "94eb5da4.00ce9"\r
+        "801a071e.c98f98",\r
+        "45d249d1.4a712",\r
+        "37813776.11957"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f4fc0b3b.90cef8",\r
+    "id": "801a071e.c98f98",\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": 4834.334014892578,\r
-    "y": 2689.2237854003906,\r
-    "z": "7062000.f761",\r
+    "x": 4802.334014892578,\r
+    "y": 2682.2237854003906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6738a6d1.eac328",\r
+    "id": "45d249d1.4a712",\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": 4831.334014892578,\r
-    "y": 2728.2237854003906,\r
-    "z": "7062000.f761",\r
+    "x": 4799.334014892578,\r
+    "y": 2721.2237854003906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "99dab506.61b3a8"\r
+        "d7c43050.0743b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "94eb5da4.00ce9",\r
+    "id": "37813776.11957",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4786.834014892578,\r
-    "y": 2770.2237854003906,\r
-    "z": "7062000.f761",\r
+    "x": 4754.834014892578,\r
+    "y": 2763.2237854003906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "99dab506.61b3a8",\r
+    "id": "d7c43050.0743b",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5011.834014892578,\r
-    "y": 2727.2237854003906,\r
-    "z": "7062000.f761",\r
+    "x": 4979.834014892578,\r
+    "y": 2720.2237854003906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d09db1ae.3d50e8"\r
+        "161c6e5f.bccb42"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d09db1ae.3d50e8",\r
+    "id": "161c6e5f.bccb42",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5169.834014892578,\r
-    "y": 2727.2237854003906,\r
-    "z": "7062000.f761",\r
+    "x": 5137.834014892578,\r
+    "y": 2720.2237854003906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b4fea58e.4d08b"\r
+        "268de5ce.943522"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b4fea58e.4d08b",\r
+    "id": "268de5ce.943522",\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": 5376.834014892578,\r
-    "y": 2727.2237854003906,\r
-    "z": "7062000.f761",\r
+    "x": 5344.834014892578,\r
+    "y": 2720.2237854003906,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9cb60767.3dae68",\r
+    "id": "5dd066fb.8bb21",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4870.216827392578,\r
-    "y": 2142.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4838.216827392578,\r
+    "y": 2135.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "20305f15.4fc8"\r
+        "4dd18012.7f83e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "20305f15.4fc8",\r
+    "id": "4dd18012.7f83e",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5047.216827392578,\r
-    "y": 2134.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5015.216827392578,\r
+    "y": 2127.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f06ad939.b3afb8",\r
-        "eb592a74.9250f"\r
+        "cb357072.40504",\r
+        "41f4620d.06ac64"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ce45d16c.d5e628",\r
+    "id": "6d52f6e9.bcbf28",\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": 4472.216827392578,\r
-    "y": 2138.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4440.216827392578,\r
+    "y": 2131.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "836b2028.73fa6"\r
+        "1558a590.3c3faa"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "836b2028.73fa6",\r
+    "id": "1558a590.3c3faa",\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": 4667.216827392578,\r
-    "y": 2138.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4635.216827392578,\r
+    "y": 2131.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "9cb60767.3dae68",\r
-        "1e4a18fb.74350f"\r
+        "5dd066fb.8bb21",\r
+        "a026e3da.a47c68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb592a74.9250f",\r
+    "id": "41f4620d.06ac64",\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": 5255.216827392578,\r
-    "y": 2141.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5223.216827392578,\r
+    "y": 2134.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b94c1f46.28b1b8",\r
-        "73a98c16.ea7094",\r
-        "1e6cb9ce.e34866"\r
+        "304be603.33560a",\r
+        "7b7d3ebe.8d439",\r
+        "4d809924.5591a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4be3f63c.7d65d8",\r
+    "id": "e13819fd.c513e8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5049.216827392578,\r
-    "y": 2207.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5017.216827392578,\r
+    "y": 2200.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "573bcde0.7ae984"\r
+        "b46e83ff.b91008"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1e4a18fb.74350f",\r
+    "id": "a026e3da.a47c68",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4872.216827392578,\r
-    "y": 2215.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4840.216827392578,\r
+    "y": 2208.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "4be3f63c.7d65d8"\r
+        "e13819fd.c513e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f06ad939.b3afb8",\r
+    "id": "cb357072.40504",\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": 5285.216827392578,\r
-    "y": 2089.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5253.216827392578,\r
+    "y": 2082.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "573bcde0.7ae984",\r
+    "id": "b46e83ff.b91008",\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": 5284.216827392578,\r
-    "y": 2331.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5252.216827392578,\r
+    "y": 2324.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b94c1f46.28b1b8",\r
+    "id": "304be603.33560a",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5465.216827392578,\r
-    "y": 2132.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5433.216827392578,\r
+    "y": 2125.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "9cca84a4.69e27"\r
+        "d9386700.ef3558"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "73a98c16.ea7094",\r
+    "id": "7b7d3ebe.8d439",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5457.216827392578,\r
-    "y": 2187.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5425.216827392578,\r
+    "y": 2180.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e1e079f9.7a9848"\r
+        "b1a122b9.2b3df"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1e6cb9ce.e34866",\r
+    "id": "4d809924.5591a8",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5462.216827392578,\r
-    "y": 2244.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5430.216827392578,\r
+    "y": 2237.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "9609b4db.95e4f"\r
+        "7206a51a.368f14"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9609b4db.95e4f",\r
+    "id": "7206a51a.368f14",\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": 5614.216827392578,\r
-    "y": 2245.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5582.216827392578,\r
+    "y": 2238.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e1e079f9.7a9848",\r
+    "id": "b1a122b9.2b3df",\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": 5625.216827392578,\r
-    "y": 2190.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5593.216827392578,\r
+    "y": 2183.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9cca84a4.69e27",\r
+    "id": "d9386700.ef3558",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5609.599151611328,\r
-    "y": 2130.5390014648438,\r
-    "z": "7062000.f761",\r
+    "x": 5577.599151611328,\r
+    "y": 2123.5390014648438,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b8027aff.eb46b"\r
+        "c475367c.4940f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b8027aff.eb46b",\r
+    "id": "c475367c.4940f8",\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": 5824.216827392578,\r
-    "y": 2126.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5792.216827392578,\r
+    "y": 2119.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cdada9b0.2f3a48",\r
+    "id": "6b01ec04.e8e8dc",\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
+    "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3322.883331298828,\r
-    "y": 1736.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3290.883331298828,\r
+    "y": 1729.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "95e31216.278c48",\r
+    "id": "6404a595.2767cc",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4544.883331298828,\r
-    "y": 1019.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4512.883331298828,\r
+    "y": 1012.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e1b848f1.cea8f8",\r
+    "id": "fdf288f5.399238",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4536.883331298828,\r
-    "y": 1109.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4504.883331298828,\r
+    "y": 1102.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "850e2800.badf2",\r
+    "id": "ce90c6ec.193398",\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
+    "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",\r
     "comments": "",\r
-    "x": 3303.883331298828,\r
-    "y": 2592.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3271.883331298828,\r
+    "y": 2585.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2b1064a0.eade7c",\r
+    "id": "323cec2c.88d45c",\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": 3454.883331298828,\r
-    "y": 2840.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3422.883331298828,\r
+    "y": 2833.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a5bcbd5b.23b83",\r
+    "id": "fba2883c.72d2",\r
     "type": "switchNode",\r
     "name": "switch found-middle-man?",\r
     "xml": "<switch test='`$found-middle-man`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3331.883331298828,\r
-    "y": 2950.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3299.883331298828,\r
+    "y": 2943.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "6b05a347.83dffc",\r
-        "734dd518.f869ec"\r
+        "b06a53c9.6a23c",\r
+        "52a66ca0.57e87c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6b05a347.83dffc",\r
+    "id": "b06a53c9.6a23c",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3515.883331298828,\r
-    "y": 2929.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3483.883331298828,\r
+    "y": 2922.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "81013cf2.231a08"\r
+        "d4c9f2dc.11912"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "734dd518.f869ec",\r
+    "id": "52a66ca0.57e87c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3051.883331298828,\r
-    "y": 4515.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3019.883331298828,\r
+    "y": 4508.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "adcb6448.ea7478"\r
+        "7ebd19ad.940af8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "68da37f9.05cc18",\r
+    "id": "d74b6b50.22dd88",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3562.883331298828,\r
-    "y": 5100.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3530.883331298828,\r
+    "y": 5093.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d849eb29.b778b",\r
-        "fb71ca0a.fe8928",\r
-        "c01640bb.f526e8",\r
-        "298d7f45.2553b",\r
-        "4ebb86dc.a0713"\r
+        "b3935092.c652b8",\r
+        "28b03e50.9f7992",\r
+        "980b4828.96504",\r
+        "17af28da.ceda4f",\r
+        "2c43e5ee.399d8a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "81013cf2.231a08",\r
+    "id": "d4c9f2dc.11912",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6634.883331298828,\r
-    "y": 2959.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6602.883331298828,\r
+    "y": 2952.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "8a2aea1.11dcc18",\r
-        "f98cf202.f36e28",\r
-        "90c516f3.625c7",\r
-        "2f838a6e.450ff6",\r
-        "1aed0e7e.f8efea",\r
-        "c314ffe6.755b68",\r
-        "92f41cb.d6037e",\r
-        "1663311a.25772f",\r
-        "12533815.a962b",\r
-        "110e6104.d57bd7",\r
-        "9037ac75.0bc238",\r
-        "3017f19.9b8270e",\r
-        "b384a7be.8178a",\r
-        "bc57a86f.472ff",\r
-        "ca7cd34b.bc2bf",\r
-        "139339a2.2c6a06",\r
-        "3b830a4d.e803be",\r
-        "9ce39c8b.582fa",\r
-        "79c8e0a2.e2d0f"\r
+        "1d7e1faa.548828",\r
+        "85f258da.5f0598",\r
+        "4b074654.080e5",\r
+        "5d8ffada.d10fc4",\r
+        "ea403b0c.aaf7e",\r
+        "1235d80a.544f18",\r
+        "af33968a.8315c",\r
+        "9cfe0ae9.258d58",\r
+        "65dbbd5b.a49b4c",\r
+        "1d15547d.10576c",\r
+        "89a6c1ea.eb5688",\r
+        "2f9ad2ef.1013a6",\r
+        "a5dc8f9.8a79df",\r
+        "e38bf422.7c8768",\r
+        "43d0f5c9.60220c",\r
+        "2b09e0eb.8326d",\r
+        "1698c025.c5ee78",\r
+        "1d008796.234d18",\r
+        "76e889a9.7e8db8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "12533815.a962b",\r
+    "id": "65dbbd5b.a49b4c",\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": 6945.883331298828,\r
-    "y": 3314.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6913.883331298828,\r
+    "y": 3307.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8a2aea1.11dcc18",\r
+    "id": "1d7e1faa.548828",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6899.883331298828,\r
-    "y": 3412.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6867.883331298828,\r
+    "y": 3405.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f98cf202.f36e28",\r
+    "id": "85f258da.5f0598",\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": 7035.883331298828,\r
-    "y": 3459.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 7003.883331298828,\r
+    "y": 3452.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c27f6f12.2b7db",\r
+    "id": "7c12d148.f08d78",\r
     "type": "comment",\r
     "name": "Create ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6866.883331298828,\r
-    "y": 3263.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6834.883331298828,\r
+    "y": 3256.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c8ec9937.7e8ac",\r
+    "id": "8342cd90.5a2f6",\r
     "type": "comment",\r
     "name": "create middle man connectivity and ...",\r
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",\r
     "comments": "",\r
-    "x": 7392.883331298828,\r
-    "y": 3754.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 7360.883331298828,\r
+    "y": 3747.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "90c516f3.625c7",\r
+    "id": "4b074654.080e5",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity middle-man",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6956.883331298828,\r
-    "y": 3793.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6924.883331298828,\r
+    "y": 3786.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2f838a6e.450ff6",\r
+    "id": "5d8ffada.d10fc4",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6904.883331298828,\r
-    "y": 3844.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6872.883331298828,\r
+    "y": 3837.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1aed0e7e.f8efea",\r
+    "id": "ea403b0c.aaf7e",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 7040.883331298828,\r
-    "y": 3891.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 7008.883331298828,\r
+    "y": 3884.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "26cc918c.53f13e",\r
+    "id": "18aaa2dc.b37a3d",\r
     "type": "comment",\r
     "name": "Create MIDDLE-MAN connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6897.883331298828,\r
-    "y": 3753.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6865.883331298828,\r
+    "y": 3746.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4f7a1677.0cc04",\r
+    "id": "b8a58f62.fd6f68",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 7327.883331298828,\r
-    "y": 3950.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 7295.883331298828,\r
+    "y": 3943.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c314ffe6.755b68",\r
+    "id": "1235d80a.544f18",\r
     "type": "save",\r
     "name": "get middle-man connectivity from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6918.883331298828,\r
-    "y": 3997.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6886.883331298828,\r
+    "y": 3990.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b94a6109.4587b8",\r
-        "244569e0.e8b39e",\r
-        "f408fad5.acd5c"\r
+        "caaa8d0a.a400c",\r
+        "ba918a95.063018",\r
+        "73076382.d5d394"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b94a6109.4587b8",\r
+    "id": "caaa8d0a.a400c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 7165.883331298828,\r
-    "y": 3951.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 7133.883331298828,\r
+    "y": 3944.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "4f7a1677.0cc04"\r
+        "b8a58f62.fd6f68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "244569e0.e8b39e",\r
+    "id": "ba918a95.063018",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 7166.374298095703,\r
-    "y": 3997.4573669433594,\r
-    "z": "7062000.f761",\r
+    "x": 7134.374298095703,\r
+    "y": 3990.4573669433594,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c4e6aa20.1e07c8"\r
+        "70335d13.df0d4c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f408fad5.acd5c",\r
+    "id": "73076382.d5d394",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 7163.883331298828,\r
-    "y": 4040.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 7131.883331298828,\r
+    "y": 4033.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5ee0d1d0.ddd63"\r
+        "3d4cb88b.ddae8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c4e6aa20.1e07c8",\r
+    "id": "70335d13.df0d4c",\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": 7328.945709228516,\r
-    "y": 3997.7431030273438,\r
-    "z": "7062000.f761",\r
+    "x": 7296.945709228516,\r
+    "y": 3990.7431030273438,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5ee0d1d0.ddd63",\r
+    "id": "3d4cb88b.ddae8",\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": 7332.883331298828,\r
-    "y": 4041.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 7300.883331298828,\r
+    "y": 4034.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ca7cd34b.bc2bf",\r
+    "id": "43d0f5c9.60220c",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6975.883331298828,\r
-    "y": 4276.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6943.883331298828,\r
+    "y": 4269.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "139339a2.2c6a06",\r
+    "id": "2b09e0eb.8326d",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6978.883331298828,\r
-    "y": 4321.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6946.883331298828,\r
+    "y": 4314.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9ce39c8b.582fa",\r
+    "id": "1d008796.234d18",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6967.883331298828,\r
-    "y": 4112.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6935.883331298828,\r
+    "y": 4105.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "79c8e0a2.e2d0f",\r
+    "id": "76e889a9.7e8db8",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6969.883331298828,\r
-    "y": 4159.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6937.883331298828,\r
+    "y": 4152.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a0361928.318ac8",\r
+    "id": "2304ec84.74d9f4",\r
     "type": "comment",\r
     "name": "The following two will be done in F1",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6891.883331298828,\r
-    "y": 4229.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6859.883331298828,\r
+    "y": 4222.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d342acdf.02b8f",\r
+    "id": "175b5cd1.9f40e3",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4521.883087158203,\r
-    "y": 5380.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4489.883087158203,\r
+    "y": 5373.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d849eb29.b778b",\r
+    "id": "b3935092.c652b8",\r
     "type": "switchNode",\r
     "name": "switch no-pce-call",\r
     "xml": "<switch test='`$no-pce-call`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3777.883331298828,\r
-    "y": 5081.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3745.883331298828,\r
+    "y": 5074.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ef9ce74a.0aa3e",\r
-        "75834f94.5997b"\r
+        "b8e9bffb.cdc88",\r
+        "256198d1.5f7cf8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "75834f94.5997b",\r
+    "id": "256198d1.5f7cf8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3949.883331298828,\r
-    "y": 5078.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3917.883331298828,\r
+    "y": 5071.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f997d531.6d1e2"\r
+        "30a42efe.828c8a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ef9ce74a.0aa3e",\r
+    "id": "b8e9bffb.cdc88",\r
     "type": "outcomeFalse",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3901.883331298828,\r
-    "y": 5925.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3869.883331298828,\r
+    "y": 5918.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7f678eb1.f9d898"\r
+        "2ed5b6b9.722642"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "94fb7d78.dd39a8",\r
+    "id": "9dc6e8a7.9c1158",\r
     "type": "comment",\r
     "name": "1 --> PCE is needed",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3962.883331298828,\r
-    "y": 5048.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3930.883331298828,\r
+    "y": 5041.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d898a291.dc858",\r
+    "id": "e1ff48b3.343b9",\r
     "type": "comment",\r
     "name": "2 --> no need to call PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3972.883331298828,\r
-    "y": 5883.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3940.883331298828,\r
+    "y": 5876.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "92f41cb.d6037e",\r
+    "id": "af33968a.8315c",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6975.883331298828,\r
-    "y": 4385.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6943.883331298828,\r
+    "y": 4378.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f997d531.6d1e2",\r
+    "id": "30a42efe.828c8a",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4125.883331298828,\r
-    "y": 5080.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4093.883331298828,\r
+    "y": 5073.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "baabeea4.9ec638",\r
-        "fd2de0c3.4119c8",\r
-        "7962decb.29a4b8",\r
-        "1df2ddf.d8fc4a2",\r
-        "bb9baf34.d0edd",\r
-        "983065a0.b74e08",\r
-        "d342acdf.02b8f"\r
+        "2892dc09.31fadc",\r
+        "afa31c79.54acd8",\r
+        "e8807ba5.c313d8",\r
+        "f07ffbda.6acb28",\r
+        "78d94074.f38b7",\r
+        "95bef4a8.5a7ff8",\r
+        "175b5cd1.9f40e3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4b2297b2.c2986",\r
+    "id": "d52f0d8d.4208d8",\r
     "type": "comment",\r
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5569.883087158203,\r
-    "y": 5005.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5537.883087158203,\r
+    "y": 4998.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "baabeea4.9ec638",\r
+    "id": "2892dc09.31fadc",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4516.883087158203,\r
-    "y": 5683.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4484.883087158203,\r
+    "y": 5676.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1663311a.25772f",\r
+    "id": "9cfe0ae9.258d58",\r
     "type": "save",\r
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6951.883331298828,\r
-    "y": 3653.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6919.883331298828,\r
+    "y": 3646.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ac7755ab.b0ef2",\r
+    "id": "753d3ee1.bef8a",\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": 3435.883331298828,\r
-    "y": 1842.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3403.883331298828,\r
+    "y": 1835.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2976ed1.40d8712",\r
+    "id": "564c1334.4c1554",\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": 3342.883331298828,\r
-    "y": 1789.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 3310.883331298828,\r
+    "y": 1782.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7c3bd1f7.b32788",\r
+    "id": "514b6193.3ff5b",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",\r
     "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",\r
     "comments": "",\r
-    "x": 7001.883331298828,\r
-    "y": 3356.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6969.883331298828,\r
+    "y": 3349.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "110e6104.d57bd7",\r
+    "id": "1d15547d.10576c",\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": 6948.883331298828,\r
-    "y": 2944.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6916.883331298828,\r
+    "y": 2937.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9037ac75.0bc238",\r
+    "id": "89a6c1ea.eb5688",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6896.883331298828,\r
-    "y": 2992.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6864.883331298828,\r
+    "y": 2985.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3017f19.9b8270e",\r
+    "id": "2f9ad2ef.1013a6",\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": 7024.883331298828,\r
-    "y": 3039.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6992.883331298828,\r
+    "y": 3032.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2b4caca8.ebe43c",\r
+    "id": "baf2c2db.c807d8",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6861.883331298828,\r
-    "y": 2902.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6829.883331298828,\r
+    "y": 2895.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b384a7be.8178a",\r
+    "id": "a5dc8f9.8a79df",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6858.883331298828,\r
-    "y": 3130.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6826.883331298828,\r
+    "y": 3123.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bc57a86f.472ff",\r
+    "id": "e38bf422.7c8768",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6951.883331298828,\r
-    "y": 3183.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6919.883331298828,\r
+    "y": 3176.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a5d38ce2.eac838",\r
+    "id": "5474c24a.9f6dac",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6842.883331298828,\r
-    "y": 3086.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6810.883331298828,\r
+    "y": 3079.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "232bd10a.a8b54e",\r
+    "id": "63adea28.503954",\r
     "type": "comment",\r
     "name": "Create ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6848.883331298828,\r
-    "y": 3536.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6816.883331298828,\r
+    "y": 3529.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1df2ddf.d8fc4a2",\r
+    "id": "f07ffbda.6acb28",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4438.883087158203,\r
-    "y": 5013.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4406.883087158203,\r
+    "y": 5006.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5696f41b.05cf84",\r
+    "id": "5623ebdb.1a4534",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4422.883087158203,\r
-    "y": 4969.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4390.883087158203,\r
+    "y": 4962.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "462a954a.4cebb4",\r
+    "id": "4b470452.112d8c",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5169.883087158203,\r
-    "y": 5000.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5137.883087158203,\r
+    "y": 4993.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5bab7896.e13d9",\r
+    "id": "effc1efd.4a1d3",\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": 5256.883087158203,\r
-    "y": 5042.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5224.883087158203,\r
+    "y": 5035.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ec708b2b.d3c6e",\r
+    "id": "5c8eea0c.68cc14",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5204.883087158203,\r
-    "y": 5090.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5172.883087158203,\r
+    "y": 5083.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "dea6b450.126ae",\r
+    "id": "e7adda57.489d68",\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": 5332.883087158203,\r
-    "y": 5137.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5300.883087158203,\r
+    "y": 5130.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "983065a0.b74e08",\r
+    "id": "95bef4a8.5a7ff8",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4509.883087158203,\r
-    "y": 5422.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4477.883087158203,\r
+    "y": 5415.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e263a78e.c8cba",\r
+    "id": "63c65355.a8cec4",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4492.883087158203,\r
-    "y": 5484.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4460.883087158203,\r
+    "y": 5477.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fd2de0c3.4119c8",\r
+    "id": "afa31c79.54acd8",\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": 4603.883087158203,\r
-    "y": 5526.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4571.883087158203,\r
+    "y": 5519.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "631f5baa.6a836c",\r
+    "id": "be0ea96a.8229",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 5051.883087158203,\r
-    "y": 5579.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5019.883087158203,\r
+    "y": 5572.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4505fb5a.3099fc",\r
+    "id": "4ebf5b73.f18c34",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4361.883087158203,\r
-    "y": 6277.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4329.883087158203,\r
+    "y": 6270.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "78bf173f.567498",\r
+    "id": "58b6c88a.c0b81",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4294.883087158203,\r
-    "y": 6231.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4262.883087158203,\r
+    "y": 6224.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "79075338.970b1c",\r
+    "id": "cd721269.4316d8",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4243.883087158203,\r
-    "y": 6182.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4211.883087158203,\r
+    "y": 6175.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "552d64d8.079684",\r
+    "id": "be012245.15127",\r
     "type": "save",\r
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5026.883331298828,\r
-    "y": 6388.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4994.883331298828,\r
+    "y": 6381.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7962decb.29a4b8",\r
+    "id": "e8807ba5.c313d8",\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": 4430.883087158203,\r
-    "y": 5583.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4398.883087158203,\r
+    "y": 5576.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a8868823.64a65",\r
-        "f3d79a89.da5f"\r
+        "572d7988.ef657",\r
+        "f53c00f0.cf63b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a8868823.64a65",\r
+    "id": "572d7988.ef657",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4641.883087158203,\r
-    "y": 5583.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4609.883087158203,\r
+    "y": 5576.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "8c7e9ec3.edd538"\r
+        "a96de56.d3d4f18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8c7e9ec3.edd538",\r
+    "id": "a96de56.d3d4f18",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4797.883087158203,\r
-    "y": 5579.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4765.883087158203,\r
+    "y": 5572.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "631f5baa.6a836c",\r
-        "e719db8e.3b76c8",\r
-        "63d85a3d.4103fc"\r
+        "be0ea96a.8229",\r
+        "d676c28d.645a28",\r
+        "bc2e1526.9ae628"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f3d79a89.da5f",\r
+    "id": "f53c00f0.cf63b8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4637.883087158203,\r
-    "y": 5631.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4605.883087158203,\r
+    "y": 5624.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c9509718.d9f2e8"\r
+        "d258f77c.8cc748"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c9509718.d9f2e8",\r
+    "id": "d258f77c.8cc748",\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": 4785.883087158203,\r
-    "y": 5626.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4753.883087158203,\r
+    "y": 5619.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "10f1aa00.faee3e",\r
+    "id": "5438b6e6.1482f8",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5293.883087158203,\r
-    "y": 5208.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5261.883087158203,\r
+    "y": 5201.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "dca67cc5.30d2f8",\r
+    "id": "42097510.f58b64",\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": 2460.883331298828,\r
-    "y": 167.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 2428.883331298828,\r
+    "y": 160.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ce64f5e6.94469",\r
+    "id": "7a55e6a1.70e4b",\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": 2394.883331298828,\r
-    "y": 203.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 2362.883331298828,\r
+    "y": 196.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "10c1b340.47f61d",\r
+    "id": "bf79a82b.b4ff98",\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": 2579.883331298828,\r
-    "y": 130.88333129882812,\r
-    "z": "7062000.f761",\r
+    "x": 2547.883331298828,\r
+    "y": 123.88333129882812,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7299a42e.833c84",\r
+    "id": "7675dfe3.26b5f8",\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": 4328.883087158203,\r
-    "y": 6343.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4296.883087158203,\r
+    "y": 6336.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "14b14bf.2fcb6b4",\r
+    "id": "ce5c7ab5.bd83c8",\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": 4461.883087158203,\r
-    "y": 6391.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4429.883087158203,\r
+    "y": 6384.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "787fc902.6b8688",\r
+    "id": "60efc6f5.6c666",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4280.883087158203,\r
-    "y": 6449.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4248.883087158203,\r
+    "y": 6442.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "17a7dc18.0b8f9c",\r
-        "f762f.a378f1d18"\r
+        "f080a66c.4f7ec8",\r
+        "652b319b.ab8708"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "17a7dc18.0b8f9c",\r
+    "id": "f080a66c.4f7ec8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4473.883087158203,\r
-    "y": 6450.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4441.883087158203,\r
+    "y": 6443.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "22a4f0b9.5cc3f"\r
+        "10a44adb.d38a25"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "22a4f0b9.5cc3f",\r
+    "id": "10a44adb.d38a25",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",\r
     "comments": "",\r
-    "x": 4629.883087158203,\r
-    "y": 6447.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4597.883087158203,\r
+    "y": 6440.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f762f.a378f1d18",\r
+    "id": "652b319b.ab8708",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4477.883087158203,\r
-    "y": 6494.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4445.883087158203,\r
+    "y": 6487.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "82673a8f.5388f"\r
+        "a7138657.394d98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "82673a8f.5388f",\r
+    "id": "a7138657.394d98",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4616.883087158203,\r
-    "y": 6489.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4584.883087158203,\r
+    "y": 6482.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "552d64d8.079684",\r
-        "b152a028.0e0e48",\r
-        "df3932b1.5cfd1",\r
-        "dd853f0d.c675b",\r
-        "6a2f520.9e626b",\r
-        "4ac1ad89.6ecd0c",\r
-        "5a7c34be.0eee64",\r
-        "f8b3148.1a90a68",\r
-        "506cbb81.2befbc",\r
-        "e29af13.61a371",\r
-        "1a8fecd4.39509b",\r
-        "2374b67.d3b424a"\r
+        "be012245.15127",\r
+        "cc830633.a13cc",\r
+        "cd9f0573.3ee2f8",\r
+        "a5be208e.ddaeb8",\r
+        "eaad5657.8cd72",\r
+        "eb39c4f9.289008",\r
+        "f25bfca7.d75338",\r
+        "ea968dfa.497e7",\r
+        "11d506a.c6a64f9",\r
+        "d968015c.39cda8",\r
+        "54a65e87.65172",\r
+        "11c77751.f259a1",\r
+        "9efae615.dd5ab"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5a7c34be.0eee64",\r
+    "id": "f25bfca7.d75338",\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": 4813.883087158203,\r
-    "y": 7168.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4781.883087158203,\r
+    "y": 7161.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "8d3fe228.0e9ab8",\r
-        "92f94e1c.33687",\r
-        "710bd5c.e65692c"\r
+        "3dba1ed8.091bf2",\r
+        "7f8f7997.fe796",\r
+        "d8010c15.3a2778"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8d3fe228.0e9ab8",\r
+    "id": "3dba1ed8.091bf2",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5018.883087158203,\r
-    "y": 7165.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4976.88330078125,\r
+    "y": 7137.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "867b5387.a77e68"\r
+        "1b65a6f4.4e2729"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "92f94e1c.33687",\r
+    "id": "7f8f7997.fe796",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5002.374053955078,\r
-    "y": 7227.457366943359,\r
-    "z": "7062000.f761",\r
+    "x": 4969.374267578125,\r
+    "y": 7174.457336425781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "32a9210e.f5a66e"\r
+        "403902c8.70c854"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "710bd5c.e65692c",\r
+    "id": "d8010c15.3a2778",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4999.883087158203,\r
-    "y": 7270.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4966.88330078125,\r
+    "y": 7217.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5f13dad2.143724"\r
+        "ab2fcd35.01c098"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "867b5387.a77e68",\r
+    "id": "1b65a6f4.4e2729",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5186.883331298828,\r
-    "y": 7160.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5148.88330078125,\r
+    "y": 7135.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a6483ec8.fd095"\r
+        "c7100026.09f848"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "32a9210e.f5a66e",\r
+    "id": "403902c8.70c854",\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": 5164.945465087891,\r
-    "y": 7227.743103027344,\r
-    "z": "7062000.f761",\r
+    "x": 5131.9456787109375,\r
+    "y": 7174.743072509766,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5f13dad2.143724",\r
+    "id": "ab2fcd35.01c098",\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": 5166.883087158203,\r
-    "y": 7269.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5133.88330078125,\r
+    "y": 7216.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a6483ec8.fd095",\r
+    "id": "c7100026.09f848",\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": 5421.883087158203,\r
-    "y": 7176.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5389.883087158203,\r
+    "y": 7169.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "2bfd9e0f.b0b65a"\r
+        "746d723d.92756c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2bfd9e0f.b0b65a",\r
+    "id": "746d723d.92756c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5658.883087158203,\r
-    "y": 7172.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5626.883087158203,\r
+    "y": 7165.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f7d1e8ad.4dc7b8"\r
+        "c84e8944.ab748"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "58dab986.f5f5a",\r
+    "id": "9e3ec759.f9e0d",\r
     "type": "switchNode",\r
     "name": "switch vpnuuid is for this slice",\r
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5925.883087158203,\r
-    "y": 7138.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5893.883087158203,\r
+    "y": 7131.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "25d3132f.f14084",\r
-        "88844ebd.a9a5b"\r
+        "4fee4c24.360bcc",\r
+        "4314046.5a68afc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "25d3132f.f14084",\r
+    "id": "4fee4c24.360bcc",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6106.883087158203,\r
-    "y": 7164.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6074.883087158203,\r
+    "y": 7157.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f7d1e8ad.4dc7b8"\r
+        "c84e8944.ab748"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "88844ebd.a9a5b",\r
+    "id": "4314046.5a68afc",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6105.883087158203,\r
-    "y": 7117.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6073.883087158203,\r
+    "y": 7110.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f7d1e8ad.4dc7b8",\r
+    "id": "c84e8944.ab748",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4849.883087158203,\r
-    "y": 7439.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4590.88330078125,\r
+    "y": 7305.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a21574dc.7f1048"\r
+        "cbf296b5.4a44d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "da2d189.a0c85e8",\r
+    "id": "1eeaf51a.0f85d3",\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": 5698.883087158203,\r
-    "y": 7344.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5666.883087158203,\r
+    "y": 7337.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9ec2c103.e591",\r
+    "id": "75dd5c17.2526e4",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4911.883087158203,\r
-    "y": 7115.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4879.88330078125,\r
+    "y": 7073.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4ac1ad89.6ecd0c",\r
+    "id": "eb39c4f9.289008",\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": 4795.883087158203,\r
-    "y": 6964.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4763.883087158203,\r
+    "y": 6957.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2add06b4.24634a",\r
+    "id": "5dce4a96.7e6e5c",\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": 5140.883087158203,\r
-    "y": 6795.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5108.883087158203,\r
+    "y": 6788.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a410e22f.bcf42"\r
+        "f4b6cbdd.4872c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a410e22f.bcf42",\r
+    "id": "f4b6cbdd.4872c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5360.883087158203,\r
-    "y": 6801.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5328.883087158203,\r
+    "y": 6794.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "22269296.bf623e"\r
+        "49771dd5.9b717c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "22269296.bf623e",\r
+    "id": "49771dd5.9b717c",\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": 5545.883087158203,\r
-    "y": 6800.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5513.883087158203,\r
+    "y": 6793.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "66b1e6be.5824e"\r
+        "444eff53.bd878"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "66b1e6be.5824e",\r
+    "id": "444eff53.bd878",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5737.883087158203,\r
-    "y": 6803.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5705.883087158203,\r
+    "y": 6796.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "19dd27ef.ab039"\r
+        "149f57f1.fd7a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "19dd27ef.ab039",\r
+    "id": "149f57f1.fd7a",\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": 5946.883087158203,\r
-    "y": 6801.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5914.883087158203,\r
+    "y": 6794.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f8b3148.1a90a68",\r
+    "id": "ea968dfa.497e7",\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": 4847.883087158203,\r
-    "y": 6789.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4815.883087158203,\r
+    "y": 6782.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "2add06b4.24634a"\r
+        "5dce4a96.7e6e5c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "df3932b1.5cfd1",\r
+    "id": "cd9f0573.3ee2f8",\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": 4855.883087158203,\r
-    "y": 6682.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4823.883087158203,\r
+    "y": 6675.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "6d632da3.ca2994",\r
-        "65bd7037.bc9ea",\r
-        "29b67365.cad774"\r
+        "e6c84893.53204",\r
+        "5e294103.3f0c78",\r
+        "8261318b.eb457"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6d632da3.ca2994",\r
+    "id": "e6c84893.53204",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5091.883087158203,\r
-    "y": 6665.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5059.883087158203,\r
+    "y": 6658.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "65bd7037.bc9ea",\r
+    "id": "5e294103.3f0c78",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5088.883087158203,\r
-    "y": 6706.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5056.883087158203,\r
+    "y": 6699.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "29b67365.cad774",\r
+    "id": "8261318b.eb457",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5102.883087158203,\r
-    "y": 6746.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5070.883087158203,\r
+    "y": 6739.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "dd853f0d.c675b",\r
+    "id": "a5be208e.ddaeb8",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
     "comments": "",\r
-    "x": 4791.883087158203,\r
-    "y": 6841.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4759.883087158203,\r
+    "y": 6834.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6a2f520.9e626b",\r
+    "id": "eaad5657.8cd72",\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": 4799.883087158203,\r
-    "y": 6899.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4767.883087158203,\r
+    "y": 6892.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b152a028.0e0e48",\r
+    "id": "cc830633.a13cc",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
     "comments": "",\r
-    "x": 4804.883087158203,\r
-    "y": 6639.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4772.883087158203,\r
+    "y": 6632.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3d7b7763.09cfd",\r
+    "id": "904e1ae5.bbd558",\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": 4919.883087158203,\r
-    "y": 6591.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4887.883087158203,\r
+    "y": 6584.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a21574dc.7f1048",\r
+    "id": "cbf296b5.4a44d",\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": 5092.883087158203,\r
-    "y": 7436.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4880.88330078125,\r
+    "y": 7300.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b03df3ba.8ce8d8",\r
-        "c15c4a9f.54e778"\r
+        "a993ecb7.4e75a",\r
+        "50a501d.eb089"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b03df3ba.8ce8d8",\r
+    "id": "a993ecb7.4e75a",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5321.883087158203,\r
-    "y": 7413.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5136.88330078125,\r
+    "y": 7272.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b68c7fcf.24567"\r
+        "2f3de295.447b1e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c15c4a9f.54e778",\r
+    "id": "50a501d.eb089",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5321.883087158203,\r
-    "y": 7462.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5136.88330078125,\r
+    "y": 7321.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b68c7fcf.24567",\r
+    "id": "ed22a86b.d791b8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5482.883087158203,\r
-    "y": 7418.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5402.88330078125,\r
+    "y": 7313.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "57615513.3c37ac",\r
-        "da2d189.a0c85e8",\r
-        "aa5be19c.b28bd"\r
+        "5c9c1b49.b9b35c",\r
+        "1eeaf51a.0f85d3",\r
+        "e4035d6c.e05158"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "41927c2c.53b90c",\r
+    "id": "f63796a1.344c48",\r
     "type": "comment",\r
     "name": "increase the bw of the-vpn-binding and change status to modified",\r
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 5826.883087158203,\r
-    "y": 7398.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5794.883087158203,\r
+    "y": 7391.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "aa5be19c.b28bd",\r
+    "id": "e4035d6c.e05158",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5796.883087158203,\r
-    "y": 7458.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5764.883087158203,\r
+    "y": 7451.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "57615513.3c37ac",\r
+    "id": "5c9c1b49.b9b35c",\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": 5703.883087158203,\r
-    "y": 7286.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5671.883087158203,\r
+    "y": 7279.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7f678eb1.f9d898",\r
+    "id": "2ed5b6b9.722642",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4053.883331298828,\r
-    "y": 5924.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4021.883331298828,\r
+    "y": 5917.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "78bf173f.567498",\r
-        "7299a42e.833c84",\r
-        "14b14bf.2fcb6b4",\r
-        "787fc902.6b8688",\r
-        "4505fb5a.3099fc"\r
+        "58b6c88a.c0b81",\r
+        "7675dfe3.26b5f8",\r
+        "ce5c7ab5.bd83c8",\r
+        "60efc6f5.6c666",\r
+        "4ebf5b73.f18c34"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "950e3220.8c6648",\r
+    "id": "8e0e6c35.35f418",\r
     "type": "set",\r
     "name": "unset otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
     "comments": "",\r
-    "x": 4796.883087158203,\r
-    "y": 6739.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4764.883087158203,\r
+    "y": 6732.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "506cbb81.2befbc",\r
+    "id": "11d506a.c6a64f9",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4919.883331298828,\r
-    "y": 6469.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4887.883331298828,\r
+    "y": 6462.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ce6bcae6.279bf",\r
+    "id": "4d39072e.34b5f8",\r
     "type": "comment",\r
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "comments": "",\r
-    "x": 5056.883331298828,\r
-    "y": 6419.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5024.883331298828,\r
+    "y": 6412.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3b830a4d.e803be",\r
+    "id": "1698c025.c5ee78",\r
     "type": "save",\r
     "name": "save ROOT UNI in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6864.883331298828,\r
-    "y": 3595.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6832.883331298828,\r
+    "y": 3588.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "debea5ca.c5efb8",\r
+    "id": "63d6aa7c.b5a514",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4070.883331298828,\r
-    "y": 1820.8833312988281,\r
-    "z": "7062000.f761",\r
+    "x": 4038.883331298828,\r
+    "y": 1813.8833312988281,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dcf5d1.89c23a3",\r
+    "id": "3aa74194.8661ee",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4048.883331298828,\r
-    "y": 2690.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4016.883331298828,\r
+    "y": 2683.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3dc14de7.91d75a",\r
+    "id": "b098a36d.e0c3e",\r
     "type": "comment",\r
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6855.883331298828,\r
-    "y": 4062.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 6823.883331298828,\r
+    "y": 4055.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2530e84c.0abb78",\r
+    "id": "2f2ed9c0.e0663e",\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": 3560.883331298828,\r
-    "y": 6064.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3528.883331298828,\r
+    "y": 6057.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fb71ca0a.fe8928",\r
+    "id": "28b03e50.9f7992",\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": 3771.883331298828,\r
-    "y": 4941.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3739.883331298828,\r
+    "y": 4934.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c01640bb.f526e8",\r
+    "id": "980b4828.96504",\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": 3904.883331298828,\r
-    "y": 4989.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3872.883331298828,\r
+    "y": 4982.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bb9baf34.d0edd",\r
+    "id": "78d94074.f38b7",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4449.883087158203,\r
-    "y": 5069.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4417.883087158203,\r
+    "y": 5062.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "9b70cfc4.c55e3",\r
-        "fdbb8f8a.783248"\r
+        "bc43fa2d.411608",\r
+        "7dd6f63d.8487f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9b70cfc4.c55e3",\r
+    "id": "bc43fa2d.411608",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4642.883087158203,\r
-    "y": 5070.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4610.883087158203,\r
+    "y": 5063.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c1e58440.70184"\r
+        "c471dfd.f92dba"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fdbb8f8a.783248",\r
+    "id": "7dd6f63d.8487f",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4646.883087158203,\r
-    "y": 5114.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4614.883087158203,\r
+    "y": 5107.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "75c1affe.0ddba8"\r
+        "a8ff6a7c.81ae98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "75c1affe.0ddba8",\r
+    "id": "a8ff6a7c.81ae98",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4785.883087158203,\r
-    "y": 5109.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4753.883087158203,\r
+    "y": 5102.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "4c2b44d5.f7301c",\r
-        "6ccb98db.74d4e8",\r
-        "d416487a.185998"\r
+        "a2ef082b.b2f048",\r
+        "fa92cb40.708c7",\r
+        "c4bba10e.ae5948"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c1e58440.70184",\r
+    "id": "c471dfd.f92dba",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4785.883087158203,\r
-    "y": 5066.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4753.883087158203,\r
+    "y": 5059.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5bab7896.e13d9",\r
-        "ec708b2b.d3c6e",\r
-        "dea6b450.126ae",\r
-        "10f1aa00.faee3e"\r
+        "effc1efd.4a1d3",\r
+        "5c8eea0c.68cc14",\r
+        "e7adda57.489d68",\r
+        "5438b6e6.1482f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4c2b44d5.f7301c",\r
+    "id": "a2ef082b.b2f048",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainA-uuid",\r
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 5179.883087158203,\r
-    "y": 5360.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5147.883087158203,\r
+    "y": 5353.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "eb20f196.54125",\r
+    "id": "963dc7de.4f275",\r
     "type": "comment",\r
     "name": "populate connectivity-A variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5186.883087158203,\r
-    "y": 5314.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5154.883087158203,\r
+    "y": 5307.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e29af13.61a371",\r
+    "id": "d968015c.39cda8",\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": 4984.883087158203,\r
-    "y": 7064.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4944.88330078125,\r
+    "y": 7022.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6ccb98db.74d4e8",\r
+    "id": "fa92cb40.708c7",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5298.883087158203,\r
-    "y": 5413.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5266.883087158203,\r
+    "y": 5406.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e719db8e.3b76c8",\r
+    "id": "d676c28d.645a28",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5180.883087158203,\r
-    "y": 5631.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5148.883087158203,\r
+    "y": 5624.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d1afb38c.0141a8",\r
+    "id": "3d7bbeb8.4fb6ea",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3735.883331298828,\r
-    "y": 4539.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3703.883331298828,\r
+    "y": 4532.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "42d36cb1.4fa424",\r
+    "id": "b16bd91d.551568",\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": 4069.883331298828,\r
-    "y": 4722.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4037.883331298828,\r
+    "y": 4715.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "298d7f45.2553b",\r
+    "id": "17af28da.ceda4f",\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": 3681.883331298828,\r
-    "y": 4589.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3649.883331298828,\r
+    "y": 4582.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "9ef5d43.2b0bca8",\r
-        "3ef07e30.e6e7da",\r
-        "f6dffd82.1f8af"\r
+        "1c28f8e9.5cfb07",\r
+        "7bdf0726.9bbbb8",\r
+        "d03c4576.8b0b7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3ef07e30.e6e7da",\r
+    "id": "7bdf0726.9bbbb8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3909.374298095703,\r
-    "y": 4562.457305908203,\r
-    "z": "7062000.f761",\r
+    "x": 3877.374298095703,\r
+    "y": 4555.457305908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "afd7cfee.d60a88"\r
+        "6a9d8f.c783f27"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f6dffd82.1f8af",\r
+    "id": "d03c4576.8b0b7",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3904.883331298828,\r
-    "y": 4606.883270263672,\r
-    "z": "7062000.f761",\r
+    "x": 3872.883331298828,\r
+    "y": 4599.883270263672,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "718ca986.9a7a48"\r
+        "732d0fc7.ef1e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "afd7cfee.d60a88",\r
+    "id": "6a9d8f.c783f27",\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": 4071.945831298828,\r
-    "y": 4561.743011474609,\r
-    "z": "7062000.f761",\r
+    "x": 4039.945831298828,\r
+    "y": 4554.743011474609,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "718ca986.9a7a48",\r
+    "id": "732d0fc7.ef1e4",\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": 4072.883331298828,\r
-    "y": 4606.883270263672,\r
-    "z": "7062000.f761",\r
+    "x": 4040.883331298828,\r
+    "y": 4599.883270263672,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bbe16e71.3e09e8",\r
+    "id": "2b632ac5.849276",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3857.883331298828,\r
-    "y": 4679.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3825.883331298828,\r
+    "y": 4672.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "2abf34d.6a0b3cc",\r
-        "42d36cb1.4fa424"\r
+        "d3a7ff82.f011",\r
+        "b16bd91d.551568"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9ef5d43.2b0bca8",\r
+    "id": "1c28f8e9.5cfb07",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3688.883331298828,\r
-    "y": 4679.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3656.883331298828,\r
+    "y": 4672.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "bbe16e71.3e09e8"\r
+        "2b632ac5.849276"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2abf34d.6a0b3cc",\r
+    "id": "d3a7ff82.f011",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 4046.883331298828,\r
-    "y": 4671.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4014.883331298828,\r
+    "y": 4664.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4ebb86dc.a0713",\r
+    "id": "2c43e5ee.399d8a",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3879.883331298828,\r
-    "y": 4817.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3847.883331298828,\r
+    "y": 4810.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e230ac3e.9cb188",\r
+    "id": "97722063.27aea",\r
     "type": "comment",\r
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3662.883331298828,\r
-    "y": 2900.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3630.883331298828,\r
+    "y": 2893.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3d29417.d2eee3e",\r
+    "id": "65778a7a.89ed44",\r
     "type": "comment",\r
     "name": "We are doing modify and middle man exists, check if LEAF UNI already exists in AAI or not. If yes, consider the possible bw change. If it does not, then it is a new link needs to be added",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3517.883331298828,\r
-    "y": 4467.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3485.883331298828,\r
+    "y": 4460.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c01a7bbf.331a48",\r
+    "id": "a2d538df.980d68",\r
     "type": "exists",\r
     "name": "exists LEAF UNI",\r
     "xml": "<exists plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3290.883331298828,\r
-    "y": 4735.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3258.883331298828,\r
+    "y": 4728.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "19c2896c.95fdb7",\r
-        "cde01ebb.100c6"\r
+        "43a12633.7a37a8",\r
+        "6d14b300.778b24"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "adcb6448.ea7478",\r
+    "id": "7ebd19ad.940af8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3122.883331298828,\r
-    "y": 4738.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3090.883331298828,\r
+    "y": 4731.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c01a7bbf.331a48"\r
+        "a2d538df.980d68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cde01ebb.100c6",\r
+    "id": "6d14b300.778b24",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3453.883331298828,\r
-    "y": 4754.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3421.883331298828,\r
+    "y": 4747.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "68da37f9.05cc18"\r
+        "d74b6b50.22dd88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "19c2896c.95fdb7",\r
+    "id": "43a12633.7a37a8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3489.883331298828,\r
-    "y": 3361.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3457.883331298828,\r
+    "y": 3354.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b19d09a1.5b2a5"\r
+        "fd9ecd52.f0eec"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e9cce0c6.04cdf8",\r
+    "id": "58f27ca9.e6694c",\r
     "type": "switchNode",\r
     "name": "switch leafuni.data-source == gfp",\r
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3805.883331298828,\r
-    "y": 3413.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3773.883331298828,\r
+    "y": 3406.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "24dd4d51.dc7852",\r
-        "a81116be.6c3738"\r
+        "f8970eb9.db20d",\r
+        "767d527f.e764f4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "24dd4d51.dc7852",\r
+    "id": "f8970eb9.db20d",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4010.883331298828,\r
-    "y": 3409.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3978.883331298828,\r
+    "y": 3402.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a81116be.6c3738",\r
+    "id": "767d527f.e764f4",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4012.883331298828,\r
-    "y": 3459.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3980.883331298828,\r
+    "y": 3452.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "29997430.010c94"\r
+        "e0571d8f.b0d5c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "29997430.010c94",\r
+    "id": "e0571d8f.b0d5c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4168.883331298828,\r
-    "y": 3465.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4136.883331298828,\r
+    "y": 3458.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f4475341.93d378",\r
-        "4264dea0.b43bb8",\r
-        "5f09d2da.19bfa4",\r
-        "c71fd59.dfc0428"\r
+        "29bbf41c.92a224",\r
+        "892518e7.2c6e68",\r
+        "36c28209.5e5a0e",\r
+        "b822f518.1b138"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f4475341.93d378",\r
+    "id": "29bbf41c.92a224",\r
     "type": "set",\r
     "name": "set bwModified",\r
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4394.883575439453,\r
-    "y": 3206.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4362.883575439453,\r
+    "y": 3199.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5f1f0cb4.e46a84",\r
+    "id": "f218f6e.d910588",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4926.883056640625,\r
-    "y": 4293.88330078125,\r
-    "z": "7062000.f761",\r
+    "x": 4894.883056640625,\r
+    "y": 4286.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "293be2f2.0d66a6",\r
-        "898be63d.63497"\r
+        "a5aad4b.a7f08a8",\r
+        "7594985d.bdad18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "898be63d.63497",\r
+    "id": "7594985d.bdad18",\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": 5128.8828125,\r
-    "y": 4260.88330078125,\r
-    "z": "7062000.f761",\r
+    "x": 5096.8828125,\r
+    "y": 4253.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "853d7a8b.2e02f",\r
+    "id": "a04d2a4d.17b14",\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": 4812.88330078125,\r
-    "y": 4470.883056640625,\r
-    "z": "7062000.f761",\r
+    "x": 4780.88330078125,\r
+    "y": 4463.883056640625,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1915e47b.7ebf64",\r
+    "id": "3892fdc5.2518b2",\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": 4809.9454345703125,\r
-    "y": 4419.743072509766,\r
-    "z": "7062000.f761",\r
+    "x": 4777.9454345703125,\r
+    "y": 4412.743072509766,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "caf66330.b1b298",\r
+    "id": "809a6f2e.e2cff",\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": 4392.883056640625,\r
-    "y": 4293.88330078125,\r
-    "z": "7062000.f761",\r
+    "x": 4360.883056640625,\r
+    "y": 4286.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ee97b865.b6783"\r
+        "663c1b4b.a64fcc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ee97b865.b6783",\r
+    "id": "663c1b4b.a64fcc",\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": 4597.883056640625,\r
-    "y": 4293.88330078125,\r
-    "z": "7062000.f761",\r
+    "x": 4565.883056640625,\r
+    "y": 4286.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c8ca8353.4e5678"\r
+        "4c765f5a.bea65"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c8ca8353.4e5678",\r
+    "id": "4c765f5a.bea65",\r
     "type": "outcome",\r
     "name": "vpn-binding",\r
     "xml": "<outcome value='vpn-binding'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4763.883056640625,\r
-    "y": 4293.88330078125,\r
-    "z": "7062000.f761",\r
+    "x": 4731.883056640625,\r
+    "y": 4286.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5f1f0cb4.e46a84"\r
+        "f218f6e.d910588"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "293be2f2.0d66a6",\r
+    "id": "a5aad4b.a7f08a8",\r
     "type": "save",\r
     "name": "get vpn-binding from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4435.883056640625,\r
-    "y": 4371.88330078125,\r
-    "z": "7062000.f761",\r
+    "x": 4403.883056640625,\r
+    "y": 4364.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "82c1720.e28a61",\r
-        "745eb7b1.5e824",\r
-        "fa83b701.248a2"\r
+        "6b0b4a54.7d0dd4",\r
+        "c44b1722.eadf8",\r
+        "30cd81de.fee396"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "82c1720.e28a61",\r
+    "id": "6b0b4a54.7d0dd4",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4646.883056640625,\r
-    "y": 4373.88330078125,\r
-    "z": "7062000.f761",\r
+    "x": 4614.883056640625,\r
+    "y": 4366.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "74de082.69b8bf8"\r
+        "d1d7ad20.29b52"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "745eb7b1.5e824",\r
+    "id": "c44b1722.eadf8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4647.3740234375,\r
-    "y": 4419.457336425781,\r
-    "z": "7062000.f761",\r
+    "x": 4615.3740234375,\r
+    "y": 4412.457336425781,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "1915e47b.7ebf64"\r
+        "3892fdc5.2518b2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fa83b701.248a2",\r
+    "id": "30cd81de.fee396",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4644.883056640625,\r
-    "y": 4462.88330078125,\r
-    "z": "7062000.f761",\r
+    "x": 4612.883056640625,\r
+    "y": 4455.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "853d7a8b.2e02f"\r
+        "a04d2a4d.17b14"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b19d09a1.5b2a5",\r
+    "id": "fd9ecd52.f0eec",\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": 3679.883331298828,\r
-    "y": 3256.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3647.883331298828,\r
+    "y": 3249.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "9b46823e.72756",\r
-        "35aaafce.bf5cc8",\r
-        "d1f12cfb.14a2c8"\r
+        "3062cdfd.42c69a",\r
+        "db9f52e5.d7dfa8",\r
+        "aae84cfb.f1edc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "35aaafce.bf5cc8",\r
+    "id": "db9f52e5.d7dfa8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3907.374298095703,\r
-    "y": 3229.457305908203,\r
-    "z": "7062000.f761",\r
+    "x": 3875.374298095703,\r
+    "y": 3222.457305908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c379ee48.9a04a"\r
+        "557116c4.068f88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d1f12cfb.14a2c8",\r
+    "id": "aae84cfb.f1edc",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3902.883331298828,\r
-    "y": 3273.883270263672,\r
-    "z": "7062000.f761",\r
+    "x": 3870.883331298828,\r
+    "y": 3266.883270263672,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7e073ce5.e1fbec"\r
+        "270e15a6.70575a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c379ee48.9a04a",\r
+    "id": "557116c4.068f88",\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": 4069.945831298828,\r
-    "y": 3228.7430114746094,\r
-    "z": "7062000.f761",\r
+    "x": 4037.945831298828,\r
+    "y": 3221.7430114746094,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7e073ce5.e1fbec",\r
+    "id": "270e15a6.70575a",\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": 4070.883331298828,\r
-    "y": 3273.883270263672,\r
-    "z": "7062000.f761",\r
+    "x": 4038.883331298828,\r
+    "y": 3266.883270263672,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9b46823e.72756",\r
+    "id": "3062cdfd.42c69a",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3914.883331298828,\r
-    "y": 3323.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 3882.883331298828,\r
+    "y": 3316.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e9cce0c6.04cdf8"\r
+        "58f27ca9.e6694c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "715dcd2e.3d9a6c",\r
+    "id": "d823dcb2.3ea1b",\r
     "type": "comment",\r
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3804.7666625976562,\r
-    "y": 3514.7666625976562,\r
-    "z": "7062000.f761",\r
+    "x": 3772.7666625976562,\r
+    "y": 3507.7666625976562,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b78f20d3.5b466",\r
+    "id": "a7eccb2d.bd2018",\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": 3819.483428955078,\r
-    "y": 3866.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 3787.483428955078,\r
+    "y": 3859.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9e72dea1.067a48",\r
+    "id": "a53a5ddb.dd60f",\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": 3957.483428955078,\r
-    "y": 3924.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 3925.483428955078,\r
+    "y": 3917.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4264dea0.b43bb8",\r
+    "id": "892518e7.2c6e68",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3535.483428955078,\r
-    "y": 3605.966583251953,\r
-    "z": "7062000.f761",\r
+    "x": 3503.483428955078,\r
+    "y": 3598.966583251953,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ea9a5f5d.8f9bf8",\r
-        "1c248a70.8f6db6",\r
-        "1f0e75d7.8b5a2a"\r
+        "b4ed3622.c08",\r
+        "c0c356fb.babc",\r
+        "67daf127.7e6a38"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d32411c9.b56a18",\r
+    "id": "fce3ea32.0915b",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3776.483428955078,\r
-    "y": 4034.366729736328,\r
-    "z": "7062000.f761",\r
+    "x": 3744.483428955078,\r
+    "y": 4027.366729736328,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e283eb67.9ec4b",\r
-        "f5e18bc8.e6b668"\r
+        "fda5acc2.f20fe",\r
+        "e480dda8.f10d98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e283eb67.9ec4b",\r
+    "id": "fda5acc2.f20fe",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3969.483428955078,\r
-    "y": 4035.366729736328,\r
-    "z": "7062000.f761",\r
+    "x": 3937.483428955078,\r
+    "y": 4028.366729736328,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ead422bf.e71108"\r
+        "90393c50.c5c688"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5e18bc8.e6b668",\r
+    "id": "e480dda8.f10d98",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3973.483428955078,\r
-    "y": 4079.366729736328,\r
-    "z": "7062000.f761",\r
+    "x": 3941.483428955078,\r
+    "y": 4072.366729736328,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c6dc9f70.44622"\r
+        "c7e0a8ee.d6f32"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c6dc9f70.44622",\r
+    "id": "c7e0a8ee.d6f32",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4112.483428955078,\r
-    "y": 4074.366729736328,\r
-    "z": "7062000.f761",\r
+    "x": 4080.483428955078,\r
+    "y": 4067.366729736328,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "caf66330.b1b298"\r
+        "809a6f2e.e2cff"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ead422bf.e71108",\r
+    "id": "90393c50.c5c688",\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": 4113.483428955078,\r
-    "y": 4031.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 4081.483428955078,\r
+    "y": 4024.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5f09d2da.19bfa4",\r
+    "id": "36c28209.5e5a0e",\r
     "type": "switchNode",\r
     "name": "switch leafuni.data-source > gfp",\r
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4428.600372314453,\r
-    "y": 3463.166778564453,\r
-    "z": "7062000.f761",\r
+    "x": 4396.600372314453,\r
+    "y": 3456.166778564453,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d442302c.ca32e",\r
-        "7bb1b9a.4551dc8"\r
+        "beb5c16.4204b4",\r
+        "cf431e74.d4d548"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d442302c.ca32e",\r
+    "id": "beb5c16.4204b4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4627.767364501953,\r
-    "y": 3529.766632080078,\r
-    "z": "7062000.f761",\r
+    "x": 4595.767364501953,\r
+    "y": 3522.766632080078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7e28b551.d4ae3c"\r
+        "105d466c.be1d02"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7bb1b9a.4551dc8",\r
+    "id": "cf431e74.d4d548",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4649.767364501953,\r
-    "y": 3374.766632080078,\r
-    "z": "7062000.f761",\r
+    "x": 4617.767364501953,\r
+    "y": 3367.766632080078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ff62768e.03d4d"\r
+        "8c32ddc1.dc0d4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c71fd59.dfc0428",\r
+    "id": "b822f518.1b138",\r
     "type": "save",\r
     "name": "update LEAF UNI in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4427.600372314453,\r
-    "y": 3318.366729736328,\r
-    "z": "7062000.f761",\r
+    "x": 4395.600372314453,\r
+    "y": 3311.366729736328,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5004b561.86b324",\r
+    "id": "3f7a0e0a.9d9b82",\r
     "type": "comment",\r
     "name": "update LEAF UNI with the new bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4443.767364501953,\r
-    "y": 3271.766632080078,\r
-    "z": "7062000.f761",\r
+    "x": 4411.767364501953,\r
+    "y": 3264.766632080078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3679700e.bfb9b8",\r
+    "id": "fd150e87.231aa",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5112.533966064453,\r
-    "y": 3248.766632080078,\r
-    "z": "7062000.f761",\r
+    "x": 5080.533966064453,\r
+    "y": 3241.766632080078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "180c72db.e0ca25",\r
+    "id": "c5a29e92.7207c",\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": 5714.533966064453,\r
-    "y": 3353.766632080078,\r
-    "z": "7062000.f761",\r
+    "x": 5682.533966064453,\r
+    "y": 3346.766632080078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "eaf2956b.f5da68",\r
+    "id": "be41e2f.9cfd32",\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": 5104.533721923828,\r
-    "y": 3294.766632080078,\r
-    "z": "7062000.f761",\r
+    "x": 5072.533721923828,\r
+    "y": 3287.766632080078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "94b5c3f.97615c",\r
-        "5f9fd4c2.f09244",\r
-        "be126d8d.81e41"\r
+        "2e2379b.d7f7006",\r
+        "db5acda.eac92b",\r
+        "bc7f8b0.aa27df8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5f9fd4c2.f09244",\r
+    "id": "db5acda.eac92b",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5332.024688720703,\r
-    "y": 3267.340606689453,\r
-    "z": "7062000.f761",\r
+    "x": 5300.024688720703,\r
+    "y": 3260.340606689453,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7b864f73.0d50b8"\r
+        "ac17b57a.282248"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be126d8d.81e41",\r
+    "id": "bc7f8b0.aa27df8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5327.533721923828,\r
-    "y": 3311.766571044922,\r
-    "z": "7062000.f761",\r
+    "x": 5295.533721923828,\r
+    "y": 3304.766571044922,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "20abe4f.26a359c"\r
+        "57de8cb.81497f4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7b864f73.0d50b8",\r
+    "id": "ac17b57a.282248",\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": 5494.596221923828,\r
-    "y": 3266.6263122558594,\r
-    "z": "7062000.f761",\r
+    "x": 5462.596221923828,\r
+    "y": 3259.6263122558594,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "20abe4f.26a359c",\r
+    "id": "57de8cb.81497f4",\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": 5495.533721923828,\r
-    "y": 3311.766571044922,\r
-    "z": "7062000.f761",\r
+    "x": 5463.533721923828,\r
+    "y": 3304.766571044922,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cd6b80d0.dac0d8",\r
+    "id": "9014714c.903978",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5492.533721923828,\r
-    "y": 3361.766632080078,\r
-    "z": "7062000.f761",\r
+    "x": 5460.533721923828,\r
+    "y": 3354.766632080078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c08f6988.b1e668",\r
-        "180c72db.e0ca25"\r
+        "cb023eec.a5c808",\r
+        "c5a29e92.7207c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "94b5c3f.97615c",\r
+    "id": "2e2379b.d7f7006",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5323.533721923828,\r
-    "y": 3361.766632080078,\r
-    "z": "7062000.f761",\r
+    "x": 5291.533721923828,\r
+    "y": 3354.766632080078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "cd6b80d0.dac0d8"\r
+        "9014714c.903978"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c08f6988.b1e668",\r
+    "id": "cb023eec.a5c808",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",\r
     "comments": "",\r
-    "x": 5674.534454345703,\r
-    "y": 3303.766632080078,\r
-    "z": "7062000.f761",\r
+    "x": 5642.534454345703,\r
+    "y": 3296.766632080078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "96b13181.04b1f8",\r
+    "id": "6d766032.1486b8",\r
     "type": "comment",\r
     "name": "bw+ has increased ",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4641.766662597656,\r
-    "y": 3336.7666625976562,\r
-    "z": "7062000.f761",\r
+    "x": 4609.766662597656,\r
+    "y": 3329.7666625976562,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a39bd08a.5e567",\r
+    "id": "56336637.740a88",\r
     "type": "comment",\r
     "name": "bw- has decreased",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4640.600372314453,\r
-    "y": 3493.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 4608.600372314453,\r
+    "y": 3486.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ca05c492.e4ea9",\r
+    "id": "e142830c.8ce718",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5089.600372314453,\r
-    "y": 3451.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 5057.600372314453,\r
+    "y": 3444.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6af65c6b.88b2a4",\r
+    "id": "253cc252.2e7476",\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": 5691.600372314453,\r
-    "y": 3556.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 5659.600372314453,\r
+    "y": 3549.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e7dc732b.754658",\r
+    "id": "e936a38f.06f2b",\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": 5081.600128173828,\r
-    "y": 3497.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 5049.600128173828,\r
+    "y": 3490.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5192fc04.bc79ac",\r
-        "9675a219.e39ec8",\r
-        "491e7a3e.fd6efc"\r
+        "6f1b7a54.b4f3a4",\r
+        "7ba2b9f4.ea954",\r
+        "c55de303.d0cb4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9675a219.e39ec8",\r
+    "id": "7ba2b9f4.ea954",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5309.091094970703,\r
-    "y": 3470.140655517578,\r
-    "z": "7062000.f761",\r
+    "x": 5277.091094970703,\r
+    "y": 3463.140655517578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "9eb1719c.df987"\r
+        "426bf991.15b6a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "491e7a3e.fd6efc",\r
+    "id": "c55de303.d0cb4",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5304.600128173828,\r
-    "y": 3514.566619873047,\r
-    "z": "7062000.f761",\r
+    "x": 5272.600128173828,\r
+    "y": 3507.566619873047,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "73d5ba80.efe18c"\r
+        "fe0c112c.8fb4f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9eb1719c.df987",\r
+    "id": "426bf991.15b6a8",\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": 5471.662628173828,\r
-    "y": 3469.4263610839844,\r
-    "z": "7062000.f761",\r
+    "x": 5439.662628173828,\r
+    "y": 3462.4263610839844,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "73d5ba80.efe18c",\r
+    "id": "fe0c112c.8fb4f",\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": 5472.600128173828,\r
-    "y": 3514.566619873047,\r
-    "z": "7062000.f761",\r
+    "x": 5440.600128173828,\r
+    "y": 3507.566619873047,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "49e14e2.90e413",\r
+    "id": "4702676.988cf18",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5469.600128173828,\r
-    "y": 3564.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 5437.600128173828,\r
+    "y": 3557.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "fc162869.747088",\r
-        "6af65c6b.88b2a4"\r
+        "2f82a117.e4a2be",\r
+        "253cc252.2e7476"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5192fc04.bc79ac",\r
+    "id": "6f1b7a54.b4f3a4",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5300.600128173828,\r
-    "y": 3564.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 5268.600128173828,\r
+    "y": 3557.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "49e14e2.90e413"\r
+        "4702676.988cf18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fc162869.747088",\r
+    "id": "2f82a117.e4a2be",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",\r
     "comments": "",\r
-    "x": 5651.600860595703,\r
-    "y": 3506.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 5619.600860595703,\r
+    "y": 3499.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "af7611a6.c24d8",\r
+    "id": "f5580ce3.db6eb8",\r
     "type": "set",\r
     "name": "set delta",\r
     "xml": "<set>\n<parameter name='tmp.delta' value='`$tmp.aai.leafuni.data-source - $gfp`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='false' />\n\n\n",\r
     "comments": "",\r
-    "x": 5006.600128173828,\r
-    "y": 3410.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 4974.600128173828,\r
+    "y": 3403.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7e28b551.d4ae3c",\r
+    "id": "105d466c.be1d02",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4799.766662597656,\r
-    "y": 3518.7666625976562,\r
-    "z": "7062000.f761",\r
+    "x": 4767.766662597656,\r
+    "y": 3511.7666625976562,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "af7611a6.c24d8",\r
-        "e7dc732b.754658"\r
+        "f5580ce3.db6eb8",\r
+        "e936a38f.06f2b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ff62768e.03d4d",\r
+    "id": "8c32ddc1.dc0d4",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4820.500030517578,\r
-    "y": 3345.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 4788.500030517578,\r
+    "y": 3338.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d835bd5d.93ef8",\r
-        "eaf2956b.f5da68"\r
+        "b0b6c683.a43628",\r
+        "be41e2f.9cfd32"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d835bd5d.93ef8",\r
+    "id": "b0b6c683.a43628",\r
     "type": "set",\r
     "name": "set delta",\r
     "xml": "<set>\n<parameter name='tmp.delta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='true' />\n",\r
     "comments": "",\r
-    "x": 5019.333526611328,\r
-    "y": 3163.366729736328,\r
-    "z": "7062000.f761",\r
+    "x": 4987.333526611328,\r
+    "y": 3156.366729736328,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2025b954.4fbac6",\r
+    "id": "c2cf98a5.f5859",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4414.649932861328,\r
-    "y": 3418.566680908203,\r
-    "z": "7062000.f761",\r
+    "x": 4382.649932861328,\r
+    "y": 3411.566680908203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "976feb0e.893a98",\r
+    "id": "53815df2.f3fe8c",\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": 3916.9833984375,\r
-    "y": 4197.3671875,\r
-    "z": "7062000.f761",\r
+    "x": 3884.9833984375,\r
+    "y": 4190.3671875,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a99b9bcd.cfe81",\r
+    "id": "1f65c294.737a2d",\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": 3751.9833984375,\r
-    "y": 4269.567138671875,\r
-    "z": "7062000.f761",\r
+    "x": 3719.9833984375,\r
+    "y": 4262.567138671875,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "98f48307.654f08",\r
-        "d531b9e1.8374e"\r
+        "d304f78f.a9e16",\r
+        "fe02c5f8.83fd58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "98f48307.654f08",\r
+    "id": "d304f78f.a9e16",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3962.9833984375,\r
-    "y": 4269.567138671875,\r
-    "z": "7062000.f761",\r
+    "x": 3930.9833984375,\r
+    "y": 4262.567138671875,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c74f3bbd.636d88"\r
+        "632bbee5.d51fe8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d531b9e1.8374e",\r
+    "id": "fe02c5f8.83fd58",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3958.9833984375,\r
-    "y": 4317.567138671875,\r
-    "z": "7062000.f761",\r
+    "x": 3926.9833984375,\r
+    "y": 4310.567138671875,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7e7563eb.7c66dc"\r
+        "670f8deb.e1038c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c74f3bbd.636d88",\r
+    "id": "632bbee5.d51fe8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4118.9833984375,\r
-    "y": 4265.567138671875,\r
-    "z": "7062000.f761",\r
+    "x": 4086.9833984375,\r
+    "y": 4258.567138671875,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "6a777147.b443f8"\r
+        "e27123aa.cc28d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7e7563eb.7c66dc",\r
+    "id": "670f8deb.e1038c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found but it should have been!' />\n",\r
     "comments": "",\r
-    "x": 4106.9833984375,\r
-    "y": 4312.567138671875,\r
-    "z": "7062000.f761",\r
+    "x": 4074.9833984375,\r
+    "y": 4305.567138671875,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d69512d3.73027",\r
+    "id": "88c84935.d74a7",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4959.949493408203,\r
-    "y": 4579.765899658203,\r
-    "z": "7062000.f761",\r
+    "x": 4927.949493408203,\r
+    "y": 4572.765899658203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "cae5635c.9a1e2",\r
-        "6f0b5fb4.a1fb4"\r
+        "c788c95c.77178",\r
+        "1fda418f.a21f6e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6f0b5fb4.a1fb4",\r
+    "id": "1fda418f.a21f6e",\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": 5202.949737548828,\r
-    "y": 4548.765899658203,\r
-    "z": "7062000.f761",\r
+    "x": 5170.949737548828,\r
+    "y": 4541.765899658203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e903ccd1.487f98",\r
+    "id": "bffc0dc9.a62e08",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4819.949493408203,\r
-    "y": 4689.765899658203,\r
-    "z": "7062000.f761",\r
+    "x": 4787.949493408203,\r
+    "y": 4682.765899658203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e80670f4.672e68"\r
+        "1b45b5a2.80df72"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c7ea39a3.498988",\r
+    "id": "5a207984.9538",\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": 4807.949737548828,\r
-    "y": 4782.766143798828,\r
-    "z": "7062000.f761",\r
+    "x": 4775.949737548828,\r
+    "y": 4775.766143798828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3f0dd5a.ea39aaa",\r
+    "id": "ff47d1c6.a1d1",\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": 4810.011871337891,\r
-    "y": 4737.625671386719,\r
-    "z": "7062000.f761",\r
+    "x": 4778.011871337891,\r
+    "y": 4730.625671386719,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6a777147.b443f8",\r
+    "id": "e27123aa.cc28d",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4425.949493408203,\r
-    "y": 4579.765899658203,\r
-    "z": "7062000.f761",\r
+    "x": 4393.949493408203,\r
+    "y": 4572.765899658203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b25b3b22.1646d"\r
+        "bdd7e518.23e34"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b25b3b22.1646d",\r
+    "id": "bdd7e518.23e34",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4630.949493408203,\r
-    "y": 4579.765899658203,\r
-    "z": "7062000.f761",\r
+    "x": 4598.949493408203,\r
+    "y": 4572.765899658203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e858f590.02822"\r
+        "e5bca59.0771c58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e858f590.02822",\r
+    "id": "e5bca59.0771c58",\r
     "type": "outcome",\r
     "name": "vpn-binding",\r
     "xml": "<outcome value='vpn-binding'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4796.949493408203,\r
-    "y": 4579.765899658203,\r
-    "z": "7062000.f761",\r
+    "x": 4764.949493408203,\r
+    "y": 4572.765899658203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d69512d3.73027"\r
+        "88c84935.d74a7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cae5635c.9a1e2",\r
+    "id": "c788c95c.77178",\r
     "type": "save",\r
     "name": "get vpn-binding from aai",\r
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4435.949493408203,\r
-    "y": 4689.765899658203,\r
-    "z": "7062000.f761",\r
+    "x": 4403.949493408203,\r
+    "y": 4682.765899658203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a8297a32.4725f",\r
-        "102b4f2b.1cfcf9",\r
-        "6f0b5913.92db28"\r
+        "9cbfda8d.34d6e8",\r
+        "7093291a.080b6",\r
+        "8f2c4a9c.eaf89"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a8297a32.4725f",\r
+    "id": "9cbfda8d.34d6e8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4646.949493408203,\r
-    "y": 4691.765899658203,\r
-    "z": "7062000.f761",\r
+    "x": 4614.949493408203,\r
+    "y": 4684.765899658203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e903ccd1.487f98"\r
+        "bffc0dc9.a62e08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "102b4f2b.1cfcf9",\r
+    "id": "7093291a.080b6",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4647.440460205078,\r
-    "y": 4737.339935302734,\r
-    "z": "7062000.f761",\r
+    "x": 4615.440460205078,\r
+    "y": 4730.339935302734,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "3f0dd5a.ea39aaa"\r
+        "ff47d1c6.a1d1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6f0b5913.92db28",\r
+    "id": "8f2c4a9c.eaf89",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4644.949493408203,\r
-    "y": 4780.765899658203,\r
-    "z": "7062000.f761",\r
+    "x": 4612.949493408203,\r
+    "y": 4773.765899658203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c7ea39a3.498988"\r
+        "5a207984.9538"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e8e91e40.c50e3",\r
+    "id": "31c1ab24.2782c4",\r
     "type": "comment",\r
     "name": "Temporary skipping this check - to support multiple instances in one slice",\r
     "info": "",\r
     "comments": "",\r
-    "x": 6055.766387939453,\r
-    "y": 7078.966827392578,\r
-    "z": "7062000.f761",\r
+    "x": 6023.766387939453,\r
+    "y": 7071.966827392578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "12a072b1.a1936d",\r
+    "id": "3272cf3c.df27d8",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5324.2333984375,\r
-    "y": 4310.16650390625,\r
-    "z": "7062000.f761",\r
+    "x": 5292.2333984375,\r
+    "y": 4303.16650390625,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "74de082.69b8bf8",\r
+    "id": "d1d7ad20.29b52",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4826.233642578125,\r
-    "y": 4376.16650390625,\r
-    "z": "7062000.f761",\r
+    "x": 4794.233642578125,\r
+    "y": 4369.16650390625,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ac63c59c.83048",\r
+    "id": "3f823260.f76936",\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": 5357.2333984375,\r
-    "y": 4378.16650390625,\r
-    "z": "7062000.f761",\r
+    "x": 5325.2333984375,\r
+    "y": 4371.16650390625,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e6f065d2.aee8e",\r
-        "6b430222.42764c"\r
+        "de937f43.9aff7",\r
+        "af59f95b.0de0c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e6f065d2.aee8e",\r
+    "id": "de937f43.9aff7",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5482.2333984375,\r
-    "y": 4276.166259765625,\r
-    "z": "7062000.f761",\r
+    "x": 5450.2333984375,\r
+    "y": 4269.166259765625,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "3f51a421.f29684"\r
+        "31c7669e.9273ea"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6b430222.42764c",\r
+    "id": "af59f95b.0de0c8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5601.233428955078,\r
-    "y": 4350.166290283203,\r
-    "z": "7062000.f761",\r
+    "x": 5569.233428955078,\r
+    "y": 4343.166290283203,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b946186b.4be33",\r
+    "id": "361b2cba.676744",\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": 4569.916534423828,\r
-    "y": 3921.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4537.916534423828,\r
+    "y": 3914.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "402f3aa1.dbe4cc",\r
+    "id": "37ee69b4.cc11f6",\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": 4914.916534423828,\r
-    "y": 3783.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4882.916534423828,\r
+    "y": 3776.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a579376d.bc3"\r
+        "35c1fec6.57172a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d26cf0c5.68acc",\r
+    "id": "a8388031.3aed68",\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": 4621.916534423828,\r
-    "y": 3777.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4589.916534423828,\r
+    "y": 3770.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "402f3aa1.dbe4cc"\r
+        "37ee69b4.cc11f6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e2cb41dc.f4c8f8",\r
+    "id": "a8458e1d.db654",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4876.916534423828,\r
-    "y": 3734.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4844.916534423828,\r
+    "y": 3727.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "72812dae.8552e4",\r
+    "id": "f592965f.32c0e8",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
     "comments": "",\r
-    "x": 4565.916534423828,\r
-    "y": 3829.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4533.916534423828,\r
+    "y": 3822.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "82192f60.51b328",\r
+    "id": "5ddf33c1.65a594",\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": 4573.916534423828,\r
-    "y": 3874.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4541.916534423828,\r
+    "y": 3867.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "37b8f0e0.bc121",\r
+    "id": "76b17a13.8ea0bc",\r
     "type": "set",\r
     "name": "unset otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
     "comments": "",\r
-    "x": 4570.916534423828,\r
-    "y": 3727.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4538.916534423828,\r
+    "y": 3720.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a579376d.bc3",\r
+    "id": "35c1fec6.57172a",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4823.916534423828,\r
-    "y": 3851.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4791.916534423828,\r
+    "y": 3844.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "bcbc46d8.da70d8"\r
+        "a725ab73.c73ac"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bcbc46d8.da70d8",\r
+    "id": "a725ab73.c73ac",\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": 5008.916534423828,\r
-    "y": 3850.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4976.916534423828,\r
+    "y": 3843.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "df0e838b.1a8"\r
+        "d15b8b2d.be0c58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "df0e838b.1a8",\r
+    "id": "d15b8b2d.be0c58",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5200.916534423828,\r
-    "y": 3853.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5168.916534423828,\r
+    "y": 3846.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "b552c813.211c2"\r
+        "8eebb571.fd6c9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b552c813.211c2",\r
+    "id": "8eebb571.fd6c9",\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": 5372.916534423828,\r
-    "y": 3849.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 5340.916534423828,\r
+    "y": 3842.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9806e019.ad2a",\r
+    "id": "4b7e80ea.96d268",\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": 4748.916534423828,\r
-    "y": 3964.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4716.916534423828,\r
+    "y": 3957.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ea9a5f5d.8f9bf8",\r
+    "id": "b4ed3622.c08",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4265.916534423828,\r
-    "y": 3749.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4233.916534423828,\r
+    "y": 3742.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "4c3bbf42.6f3d68",\r
-        "e37c29b1.ce632",\r
-        "72812dae.8552e4",\r
-        "82192f60.51b328",\r
-        "b946186b.4be33",\r
-        "d26cf0c5.68acc",\r
-        "9806e019.ad2a"\r
+        "26ef8b2b.34003c",\r
+        "269ffcd4.c70e7c",\r
+        "f592965f.32c0e8",\r
+        "5ddf33c1.65a594",\r
+        "361b2cba.676744",\r
+        "a8388031.3aed68",\r
+        "4b7e80ea.96d268"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "805d495b.3d6b18",\r
+    "id": "ce279396.ecc818",\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": 4250.916534423828,\r
-    "y": 3683.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4218.916534423828,\r
+    "y": 3676.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e37c29b1.ce632",\r
+    "id": "269ffcd4.c70e7c",\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": 4629.916534423828,\r
-    "y": 3670.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4597.916534423828,\r
+    "y": 3663.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "942a4caf.d868d8",\r
-        "8905a79d.0fb76",\r
-        "e2cb41dc.f4c8f8"\r
+        "2b1251d3.218d36",\r
+        "69b1ddc7.bc8184",\r
+        "a8458e1d.db654"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "942a4caf.d868d8",\r
+    "id": "2b1251d3.218d36",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4865.916534423828,\r
-    "y": 3653.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4833.916534423828,\r
+    "y": 3646.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8905a79d.0fb76",\r
+    "id": "69b1ddc7.bc8184",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4862.916534423828,\r
-    "y": 3694.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4830.916534423828,\r
+    "y": 3687.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4c3bbf42.6f3d68",\r
+    "id": "26ef8b2b.34003c",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
     "comments": "",\r
-    "x": 4578.916534423828,\r
-    "y": 3627.883331298828,\r
-    "z": "7062000.f761",\r
+    "x": 4546.916534423828,\r
+    "y": 3620.883331298828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "94da922f.c01d98",\r
+    "id": "a7d12ef0.b4e948",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5308.316436767578,\r
-    "y": 4677.283233642578,\r
-    "z": "7062000.f761",\r
+    "x": 5276.316436767578,\r
+    "y": 4670.283233642578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e80670f4.672e68",\r
+    "id": "1b45b5a2.80df72",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5097.316436767578,\r
-    "y": 4739.283233642578,\r
-    "z": "7062000.f761",\r
+    "x": 5065.316436767578,\r
+    "y": 4732.283233642578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ed69a679.8ddb2"\r
+        "ed1b64d5.33faa"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ed69a679.8ddb2",\r
+    "id": "ed1b64d5.33faa",\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": 5341.316436767578,\r
-    "y": 4745.283233642578,\r
-    "z": "7062000.f761",\r
+    "x": 5309.316436767578,\r
+    "y": 4738.283233642578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "90bf5e35.d23788",\r
-        "6659c466.b510dc"\r
+        "230e8d7f.cf5b82",\r
+        "8c0eb7af.7df34"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "90bf5e35.d23788",\r
+    "id": "230e8d7f.cf5b82",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5572.316436767578,\r
-    "y": 4723.283233642578,\r
-    "z": "7062000.f761",\r
+    "x": 5540.316436767578,\r
+    "y": 4716.283233642578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5ef895fb.b1bf7c"\r
+        "626950bd.12ae3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6659c466.b510dc",\r
+    "id": "8c0eb7af.7df34",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5577.316436767578,\r
-    "y": 4790.283233642578,\r
-    "z": "7062000.f761",\r
+    "x": 5545.316436767578,\r
+    "y": 4783.283233642578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ef985380.75ae68",\r
+    "id": "a8be8ed1.6d85c",\r
     "type": "switchNode",\r
     "name": "switch tmp.isBwIncreased",\r
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5826.2001953125,\r
-    "y": 4287.965576171875,\r
-    "z": "7062000.f761",\r
+    "x": 5794.2001953125,\r
+    "y": 4280.965576171875,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "76a7bc4a.dd01dc",\r
-        "c64cf61b.17568"\r
+        "5f515b8.97d0aa4",\r
+        "e3c5fe18.dd7758"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "76a7bc4a.dd01dc",\r
+    "id": "5f515b8.97d0aa4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5981.200225830078,\r
-    "y": 4215.965850830078,\r
-    "z": "7062000.f761",\r
+    "x": 5949.200225830078,\r
+    "y": 4208.965850830078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "79b64e60.35626"\r
+        "b9ddbbac.4ceb18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c64cf61b.17568",\r
+    "id": "e3c5fe18.dd7758",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5982.200225830078,\r
-    "y": 4348.965850830078,\r
-    "z": "7062000.f761",\r
+    "x": 5950.200225830078,\r
+    "y": 4341.965850830078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "d1f760ec.7590a"\r
+        "7f4f722.c77710c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "79b64e60.35626",\r
+    "id": "b9ddbbac.4ceb18",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6126.200225830078,\r
-    "y": 4215.966094970703,\r
-    "z": "7062000.f761",\r
+    "x": 6094.200225830078,\r
+    "y": 4208.966094970703,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "a1fc801a.8dde7",\r
-        "f7199aa1.5a0618"\r
+        "c99d2def.311358",\r
+        "6bec6ba7.e1cedc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a1fc801a.8dde7",\r
+    "id": "c99d2def.311358",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6419.200225830078,\r
-    "y": 4193.965850830078,\r
-    "z": "7062000.f761",\r
+    "x": 6387.200225830078,\r
+    "y": 4186.965850830078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f7199aa1.5a0618",\r
+    "id": "6bec6ba7.e1cedc",\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": 6370.850128173828,\r
-    "y": 4241.282745361328,\r
-    "z": "7062000.f761",\r
+    "x": 6338.850128173828,\r
+    "y": 4234.282745361328,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "598a3c97.c62cd4",\r
+    "id": "9711fbcd.9495e8",\r
     "type": "comment",\r
     "name": "increase the bw of the-vpn-binding and change status to modified",\r
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 6443.200225830078,\r
-    "y": 4154.965850830078,\r
-    "z": "7062000.f761",\r
+    "x": 6412.2001953125,\r
+    "y": 4135.965576171875,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d1f760ec.7590a",\r
+    "id": "7f4f722.c77710c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6138.200225830078,\r
-    "y": 4347.966094970703,\r
-    "z": "7062000.f761",\r
+    "x": 6106.200225830078,\r
+    "y": 4340.966094970703,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e43682b5.56552",\r
-        "8aed809d.a72bd8"\r
+        "59431729.1fb158",\r
+        "1fc311b.d897f6e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e43682b5.56552",\r
+    "id": "59431729.1fb158",\r
     "type": "save",\r
     "name": "update the-vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6431.200225830078,\r
-    "y": 4325.965850830078,\r
-    "z": "7062000.f761",\r
+    "x": 6399.200225830078,\r
+    "y": 4318.965850830078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8aed809d.a72bd8",\r
+    "id": "1fc311b.d897f6e",\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": 6382.850128173828,\r
-    "y": 4373.282745361328,\r
-    "z": "7062000.f761",\r
+    "x": 6350.850128173828,\r
+    "y": 4366.282745361328,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3a2ab7c7.d2dab8",\r
+    "id": "1617355e.191edb",\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": 6455.200225830078,\r
-    "y": 4286.965850830078,\r
-    "z": "7062000.f761",\r
+    "x": 6423.200225830078,\r
+    "y": 4279.965850830078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5ef895fb.b1bf7c",\r
+    "id": "626950bd.12ae3",\r
     "type": "switchNode",\r
     "name": "switch tmp.isBwIncreased",\r
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5777.433135986328,\r
-    "y": 4730.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5745.433135986328,\r
+    "y": 4723.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "3e55897.59031f6",\r
-        "a1d97b4a.208e4"\r
+        "a17c6b6f.2c879",\r
+        "a4050844.87c708"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3e55897.59031f6",\r
+    "id": "a17c6b6f.2c879",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5972.433135986328,\r
-    "y": 4658.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5940.433135986328,\r
+    "y": 4651.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "1661a8d0.f6d65f"\r
+        "cccf95aa.d66d78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a1d97b4a.208e4",\r
+    "id": "a4050844.87c708",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5973.433135986328,\r
-    "y": 4791.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5941.433135986328,\r
+    "y": 4784.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "5810f31a.0a9ed4"\r
+        "90ce4884.5c53c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1661a8d0.f6d65f",\r
+    "id": "cccf95aa.d66d78",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6117.433135986328,\r
-    "y": 4658.166778564453,\r
-    "z": "7062000.f761",\r
+    "x": 6085.433135986328,\r
+    "y": 4651.166778564453,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "da6580ac.af986",\r
-        "ee810baa.63495"\r
+        "c37b260.db0c1d8",\r
+        "742aa3a0.c04704"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "da6580ac.af986",\r
+    "id": "c37b260.db0c1d8",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6410.433135986328,\r
-    "y": 4636.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 6378.433135986328,\r
+    "y": 4629.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ee810baa.63495",\r
+    "id": "742aa3a0.c04704",\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": 6362.083038330078,\r
-    "y": 4683.483428955078,\r
-    "z": "7062000.f761",\r
+    "x": 6330.083038330078,\r
+    "y": 4676.483428955078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "87cf660.a2b3f18",\r
+    "id": "5708f1c2.de612",\r
     "type": "comment",\r
     "name": "increase the bw of the-vpn-binding and change status to modified",\r
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 6434.433135986328,\r
-    "y": 4597.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 6402.433135986328,\r
+    "y": 4590.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5810f31a.0a9ed4",\r
+    "id": "90ce4884.5c53c8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6129.433135986328,\r
-    "y": 4790.166778564453,\r
-    "z": "7062000.f761",\r
+    "x": 6097.433135986328,\r
+    "y": 4783.166778564453,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "80c260b2.6af7a",\r
-        "9a874787.276bd"\r
+        "9bebcf2c.a35908",\r
+        "bf7ecccc.77e158"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "80c260b2.6af7a",\r
+    "id": "9bebcf2c.a35908",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6422.433135986328,\r
-    "y": 4768.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 6390.433135986328,\r
+    "y": 4761.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9a874787.276bd",\r
+    "id": "bf7ecccc.77e158",\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": 6374.083038330078,\r
-    "y": 4815.483428955078,\r
-    "z": "7062000.f761",\r
+    "x": 6342.083038330078,\r
+    "y": 4808.483428955078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "815fc293.94d2f8",\r
+    "id": "898aa8ca.144488",\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": 6446.433135986328,\r
-    "y": 4729.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 6414.433135986328,\r
+    "y": 4722.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a537e9a.90f0c98",\r
+    "id": "3302d733.17cb08",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5185.283233642578,\r
-    "y": 5470.366729736328,\r
-    "z": "7062000.f761",\r
+    "x": 5153.283233642578,\r
+    "y": 5463.366729736328,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d416487a.185998",\r
+    "id": "c4bba10e.ae5948",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5183.066436767578,\r
-    "y": 5510.566925048828,\r
-    "z": "7062000.f761",\r
+    "x": 5151.066436767578,\r
+    "y": 5503.566925048828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7898de27.66a698",\r
+    "id": "fba1ca00.18c228",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5058.316680908203,\r
-    "y": 5695.049835205078,\r
-    "z": "7062000.f761",\r
+    "x": 5026.316680908203,\r
+    "y": 5688.049835205078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "63d85a3d.4103fc",\r
+    "id": "bc2e1526.9ae628",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5056.099884033203,\r
-    "y": 5735.250030517578,\r
-    "z": "7062000.f761",\r
+    "x": 5024.099884033203,\r
+    "y": 5728.250030517578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "105ea6a7.242f79",\r
+    "id": "c14b3eb1.3ce2b",\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": 5160.433135986328,\r
-    "y": 6178.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5128.433135986328,\r
+    "y": 6171.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8f43e7c7.1c41b8",\r
+    "id": "78d24bb0.4c8ea4",\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": 4987.433135986328,\r
-    "y": 6235.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 4955.433135986328,\r
+    "y": 6228.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "4e0d7b1b.4cc2ec",\r
-        "609ed3b9.40f534"\r
+        "8d0d07ba.6f81c8",\r
+        "4ae3fa7f.c7968c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4e0d7b1b.4cc2ec",\r
+    "id": "8d0d07ba.6f81c8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5198.433135986328,\r
-    "y": 6235.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5166.433135986328,\r
+    "y": 6228.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c2d7112c.1b117"\r
+        "7c55c647.3c8228"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "609ed3b9.40f534",\r
+    "id": "4ae3fa7f.c7968c",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5194.433135986328,\r
-    "y": 6283.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5162.433135986328,\r
+    "y": 6276.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "fd4c4e47.075cf8"\r
+        "2e757361.f3de2c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c2d7112c.1b117",\r
+    "id": "7c55c647.3c8228",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5354.433135986328,\r
-    "y": 6231.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5322.433135986328,\r
+    "y": 6224.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "c4eacefe.2b5518",\r
-        "773bf221.e0586c",\r
-        "f38f117c.80c7b8"\r
+        "2cbacdde.26f332",\r
+        "94ab2e80.b69ba8",\r
+        "d5533498.f6f7f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fd4c4e47.075cf8",\r
+    "id": "2e757361.f3de2c",\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": 5342.433135986328,\r
-    "y": 6278.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5310.433135986328,\r
+    "y": 6271.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a5cbc756.e321b8",\r
+    "id": "510063da.63ac6c",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5620.316925048828,\r
-    "y": 6331.049835205078,\r
-    "z": "7062000.f761",\r
+    "x": 5588.316925048828,\r
+    "y": 6324.049835205078,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f38f117c.80c7b8",\r
+    "id": "d5533498.f6f7f",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5618.100128173828,\r
-    "y": 6371.250030517578,\r
-    "z": "7062000.f761",\r
+    "x": 5586.100128173828,\r
+    "y": 6364.250030517578,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "773bf221.e0586c",\r
+    "id": "94ab2e80.b69ba8",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5737.433135986328,\r
-    "y": 6283.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5705.433135986328,\r
+    "y": 6276.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c4eacefe.2b5518",\r
+    "id": "2cbacdde.26f332",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 5608.433135986328,\r
-    "y": 6231.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5576.433135986328,\r
+    "y": 6224.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5ff4d90f.61eca8",\r
+    "id": "d8a0b134.770b1",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5049.433135986328,\r
-    "y": 6136.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5017.433135986328,\r
+    "y": 6129.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1a8fecd4.39509b",\r
+    "id": "54a65e87.65172",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4756.766143798828,\r
-    "y": 6218.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 4724.766143798828,\r
+    "y": 6211.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "105ea6a7.242f79",\r
-        "8f43e7c7.1c41b8"\r
+        "c14b3eb1.3ce2b",\r
+        "78d24bb0.4c8ea4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2374b67.d3b424a",\r
+    "id": "11c77751.f259a1",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5035.516632080078,\r
-    "y": 6533.166534423828,\r
-    "z": "7062000.f761",\r
+    "x": 5003.516632080078,\r
+    "y": 6526.166534423828,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5d1aa304.0ec964",\r
+    "id": "7eabc766.dd7c8",\r
     "type": "comment",\r
     "name": "TODO: BUG -- DONE",\r
     "info": "momkene connectivity haye vasati ke dummy hastand ham\nvpn-binding dashte bashand ke too in path involve hast pas\nbayad bw aan niz update shavad.",\r
     "comments": "",\r
-    "x": 3740.8837890625,\r
-    "y": 3809.88330078125,\r
-    "z": "7062000.f761",\r
+    "x": 3708.8837890625,\r
+    "y": 3802.88330078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1c248a70.8f6db6",\r
+    "id": "c0c356fb.babc",\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": 4493.4169921875,\r
-    "y": 4084,\r
-    "z": "7062000.f761",\r
+    "x": 4461.4169921875,\r
+    "y": 4077,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "e8d15ab4.54c49",\r
-        "20b8f97c.98322e",\r
-        "6302d7c5.b6ebe8"\r
+        "b8196ee9.4b3808",\r
+        "80c1418b.2150d8",\r
+        "56405931.8c65f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3d05d16c.2a1566",\r
+    "id": "eb18f7d.31abf88",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4595.4169921875,\r
-    "y": 4049,\r
-    "z": "7062000.f761",\r
+    "x": 4569.417236328125,\r
+    "y": 4033,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e8d15ab4.54c49",\r
+    "id": "b8196ee9.4b3808",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4698.4169921875,\r
-    "y": 4081,\r
-    "z": "7062000.f761",\r
+    "x": 4666.4169921875,\r
+    "y": 4074,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "7ec23daa.6a0bc4"\r
+        "9aacf189.24898"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "20b8f97c.98322e",\r
+    "id": "80c1418b.2150d8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4681.907958984375,\r
-    "y": 4142.574035644531,\r
-    "z": "7062000.f761",\r
+    "x": 4649.907958984375,\r
+    "y": 4135.574035644531,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "36ba2eea.c2f3b2"\r
+        "de469de6.448a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6302d7c5.b6ebe8",\r
+    "id": "56405931.8c65f8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4679.4169921875,\r
-    "y": 4186,\r
-    "z": "7062000.f761",\r
+    "x": 4647.4169921875,\r
+    "y": 4179,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "949d59bf.9e67a"\r
+        "6c1db7b.a15c7c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7ec23daa.6a0bc4",\r
+    "id": "9aacf189.24898",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4866.417236328125,\r
-    "y": 4076,\r
-    "z": "7062000.f761",\r
+    "x": 4834.417236328125,\r
+    "y": 4069,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "df77d6a9.222ef"\r
+        "3b0478b5.ff78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "36ba2eea.c2f3b2",\r
+    "id": "de469de6.448a8",\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": 4844.4793701171875,\r
-    "y": 4142.859771728516,\r
-    "z": "7062000.f761",\r
+    "x": 4812.4793701171875,\r
+    "y": 4135.859771728516,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "949d59bf.9e67a",\r
+    "id": "6c1db7b.a15c7c8",\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": 4846.4169921875,\r
-    "y": 4185,\r
-    "z": "7062000.f761",\r
+    "x": 4814.4169921875,\r
+    "y": 4178,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "df77d6a9.222ef",\r
+    "id": "3b0478b5.ff78",\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": 5104.417236328125,\r
-    "y": 4081,\r
-    "z": "7062000.f761",\r
+    "x": 5072.417236328125,\r
+    "y": 4074,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "abc8ebdb.52f0a8"\r
+        "b59112.09635ef"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "abc8ebdb.52f0a8",\r
+    "id": "b59112.09635ef",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5338.4169921875,\r
-    "y": 4088,\r
-    "z": "7062000.f761",\r
+    "x": 5306.4169921875,\r
+    "y": 4081,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ac63c59c.83048"\r
+        "3f823260.f76936"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1f0e75d7.8b5a2a",\r
+    "id": "67daf127.7e6a38",\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": 4472.11669921875,\r
-    "y": 4010,\r
-    "z": "7062000.f761",\r
+    "x": 4440.11669921875,\r
+    "y": 4003,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bffd072f.5e512",\r
+    "id": "11444ec1.8e4d01",\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": 5755.2666015625,\r
-    "y": 4098.5830078125,\r
-    "z": "7062000.f761",\r
+    "x": 5723.2666015625,\r
+    "y": 4091.5830078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "f3f61fe0.c57dd"\r
+        "f98d1d31.14c4f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f3f61fe0.c57dd",\r
+    "id": "f98d1d31.14c4f8",\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": 5947.2666015625,\r
-    "y": 4087.583251953125,\r
-    "z": "7062000.f761",\r
+    "x": 5915.2666015625,\r
+    "y": 4080.583251953125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "8cedd329.3f3c9"\r
+        "894c5e31.55f348"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8cedd329.3f3c9",\r
+    "id": "894c5e31.55f348",\r
     "type": "outcome",\r
     "name": "connectivity",\r
     "xml": "<outcome value='connectivity'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6129.2666015625,\r
-    "y": 4066.583251953125,\r
-    "z": "7062000.f761",\r
+    "x": 6097.2666015625,\r
+    "y": 4059.583251953125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "86e0777f.9370f"\r
+        "2837af93.7fedb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "86e0777f.9370f",\r
+    "id": "2837af93.7fedb8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 6291.2666015625,\r
-    "y": 4055.583251953125,\r
-    "z": "7062000.f761",\r
+    "x": 6259.2666015625,\r
+    "y": 4048.583251953125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "869c4324.9670f",\r
-        "bbb484a7.96add8"\r
+        "75575304.c30724",\r
+        "fb102e8c.f8d02"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "869c4324.9670f",\r
+    "id": "75575304.c30724",\r
     "type": "set",\r
     "name": "unset tmp.the-connectivity",\r
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",\r
     "comments": "",\r
-    "x": 6488.2666015625,\r
-    "y": 3984.583251953125,\r
-    "z": "7062000.f761",\r
+    "x": 6456.2666015625,\r
+    "y": 3977.583251953125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3f51a421.f29684",\r
+    "id": "812bc4de.8330d",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5609.216796875,\r
-    "y": 4214.582763671875,\r
-    "z": "7062000.f761",\r
+    "x": 5630.216796875,\r
+    "y": 4206.5830078125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": [\r
       [\r
-        "ef985380.75ae68",\r
-        "bffd072f.5e512",\r
-        "bbf89c4c.2b2c98",\r
-        "55e59a7f.53654c"\r
+        "a8be8ed1.6d85c",\r
+        "11444ec1.8e4d01",\r
+        "7f9cffe2.08c768",\r
+        "8c2c4043.586498"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bbf89c4c.2b2c98",\r
+    "id": "7f9cffe2.08c768",\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": 5793.783203125,\r
-    "y": 3988.800048828125,\r
-    "z": "7062000.f761",\r
+    "x": 5761.783203125,\r
+    "y": 3981.800048828125,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "55e59a7f.53654c",\r
+    "id": "8c2c4043.586498",\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": 5785.783203125,\r
-    "y": 4037.800048828125,\r
-    "z": "7062000.f761",\r
+    "x": 5753.783203125,\r
+    "y": 4030.800048828125,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": []\r
+  },\r
+  {\r
+    "id": "fb102e8c.f8d02",\r
+    "type": "set",\r
+    "name": "set tmp.the-connectivity.connectivity-id",\r
+    "xml": "<set>\n<parameter name='tmp.the-connectivity.connectivity-id' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",\r
+    "comments": "",\r
+    "x": 6461.7333984375,\r
+    "y": 4086.800048828125,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": []\r
+  },\r
+  {\r
+    "id": "a9133f1b.8373c8",\r
+    "type": "set",\r
+    "name": "set vpnNameToSearch",\r
+    "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
+    "comments": "",\r
+    "x": 5755,\r
+    "y": 3805,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": []\r
+  },\r
+  {\r
+    "id": "4b95d87b.bccc58",\r
+    "type": "call",\r
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5909,\r
+    "y": 3857,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": [\r
+      []\r
+    ]\r
+  },\r
+  {\r
+    "id": "31c7669e.9273ea",\r
+    "type": "block",\r
+    "name": "block : atomic",\r
+    "xml": "<block atomic='true'>",\r
+    "atomic": "true",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5500,\r
+    "y": 3924,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": [\r
+      [\r
+        "4b95d87b.bccc58",\r
+        "26b17ecc.f40902",\r
+        "a9133f1b.8373c8"\r
+      ]\r
+    ]\r
+  },\r
+  {\r
+    "id": "26b17ecc.f40902",\r
+    "type": "switchNode",\r
+    "name": "switch $foundVpnName",\r
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5754,\r
+    "y": 3912,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": [\r
+      [\r
+        "245d39b1.fcc7b6"\r
+      ]\r
+    ]\r
+  },\r
+  {\r
+    "id": "245d39b1.fcc7b6",\r
+    "type": "outcomeTrue",\r
+    "name": "true",\r
+    "xml": "<outcome value='true'>\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5933,\r
+    "y": 3911,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": [\r
+      [\r
+        "812bc4de.8330d"\r
+      ]\r
+    ]\r
+  },\r
+  {\r
+    "id": "2f3de295.447b1e",\r
+    "type": "block",\r
+    "name": "block : atomic",\r
+    "xml": "<block atomic='true'>",\r
+    "atomic": "true",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 4631,\r
+    "y": 7429,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": [\r
+      [\r
+        "48382561.04ccdc",\r
+        "a0fe64b2.d649a",\r
+        "3a51bb36.70835c"\r
+      ]\r
+    ]\r
+  },\r
+  {\r
+    "id": "3a51bb36.70835c",\r
+    "type": "set",\r
+    "name": "set vpnNameToSearch",\r
+    "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
+    "comments": "",\r
+    "x": 4854,\r
+    "y": 7373,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bbb484a7.96add8",\r
+    "id": "48382561.04ccdc",\r
+    "type": "call",\r
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5033,\r
+    "y": 7416,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": [\r
+      []\r
+    ]\r
+  },\r
+  {\r
+    "id": "a0fe64b2.d649a",\r
+    "type": "switchNode",\r
+    "name": "switch $foundVpnName",\r
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 4878,\r
+    "y": 7471,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": [\r
+      [\r
+        "e761a2b0.d43cc"\r
+      ]\r
+    ]\r
+  },\r
+  {\r
+    "id": "e761a2b0.d43cc",\r
+    "type": "outcomeTrue",\r
+    "name": "true",\r
+    "xml": "<outcome value='true'>\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 5057,\r
+    "y": 7470,\r
+    "z": "1854297c.6f0f4f",\r
+    "wires": [\r
+      [\r
+        "ed22a86b.d791b8"\r
+      ]\r
+    ]\r
+  },\r
+  {\r
+    "id": "9efae615.dd5ab",\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
+    "name": "unset tmp.aai.all-vpn-bindings",\r
+    "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",\r
     "comments": "",\r
-    "x": 6485.7333984375,\r
-    "y": 4083.800048828125,\r
-    "z": "7062000.f761",\r
+    "x": 4788,\r
+    "y": 7109,\r
+    "z": "1854297c.6f0f4f",\r
     "wires": []\r
   }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.json
new file mode 100644 (file)
index 0000000..5374088
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.json
@@ -0,0 +1,678 @@
+[
+  {
+    "id": "31e5d2b5.0599fe",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='mmridx' start='0' end='`$tmp.aai.mmrconnectivity.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 236,
+    "y": 993,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "a78d056.b5ab7f8",
+        "e1cdc8ba.a395c"
+      ]
+    ]
+  },
+  {
+    "id": "e1cdc8ba.a395c",
+    "type": "set",
+    "name": "unset tmp.aai.mmrvpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.mmrvpn-binding.' value='' />\n",
+    "comments": "",
+    "x": 482,
+    "y": 949,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "a78d056.b5ab7f8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$mmridx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 442,
+    "y": 993,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "7bf078a.9be4108"
+      ]
+    ]
+  },
+  {
+    "id": "7bf078a.9be4108",
+    "type": "outcome",
+    "name": "vpn-binding",
+    "xml": "<outcome value='vpn-binding'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 625.28564453125,
+    "y": 992.82177734375,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "215d3faa.f51c98"
+      ]
+    ]
+  },
+  {
+    "id": "215d3faa.f51c98",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 225,
+    "y": 1037,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "b17f0df1.95c4d8"
+      ]
+    ]
+  },
+  {
+    "id": "b17f0df1.95c4d8",
+    "type": "switchNode",
+    "name": "switch vpnNameToSearch",
+    "xml": "<switch test='`$vpnNameToSearch == $middle-man-conn.relationship-list.relationship[$mmridx].related-to-property[0].property-value`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 430,
+    "y": 1038,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "21e2127f.8c1dd6"
+      ]
+    ]
+  },
+  {
+    "id": "be70d08a.d902c8",
+    "type": "set",
+    "name": "unset foundVpnName",
+    "xml": "<set>\n<parameter name='foundVpnName' value='false' />\n",
+    "comments": "",
+    "x": 957,
+    "y": 136,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "21e2127f.8c1dd6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 610,
+    "y": 1038,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "de7119e9.e6ede"
+      ]
+    ]
+  },
+  {
+    "id": "de7119e9.e6ede",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 731,
+    "y": 1035,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "fd90809a.6ecd2",
+        "99d884af.46fd"
+      ]
+    ]
+  },
+  {
+    "id": "fd90809a.6ecd2",
+    "type": "set",
+    "name": "set foundVpnName",
+    "xml": "<set>\n<parameter name='foundVpnName' value='true' />\n",
+    "comments": "",
+    "x": 896,
+    "y": 1004,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "99d884af.46fd",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 859,
+    "y": 1049,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "6c40187e.e79158",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 157,
+    "y": 62,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "3a7938e1.994d7"
+      ]
+    ]
+  },
+  {
+    "id": "3a7938e1.994d7",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs": 1,
+    "x": 441.2856903076172,
+    "y": 123.23810863494873,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "f46afc6.271308"
+      ]
+    ]
+  },
+  {
+    "id": "f46afc6.271308",
+    "type": "method",
+    "name": "method cll-vnf-topology-operation-cll-searchVpnName",
+    "xml": "<method rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 447.42860412597656,
+    "y": 208.00003051757812,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "45b2ac64.9618cc"
+      ]
+    ]
+  },
+  {
+    "id": "45b2ac64.9618cc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 757.238037109375,
+    "y": 199.66668701171875,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "be70d08a.d902c8",
+        "c0805bdc.60a32"
+      ]
+    ]
+  },
+  {
+    "id": "c0805bdc.60a32",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='mmridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 856,
+    "y": 289,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "7c17985e.24b9a8",
+        "2b1d3c50.df6fdc",
+        "cfff50b2.fe63"
+      ]
+    ]
+  },
+  {
+    "id": "2b1d3c50.df6fdc",
+    "type": "set",
+    "name": "unset tmp.aai.mmrconnectivity",
+    "xml": "<set>\n<parameter name='tmp.aai.mmrconnectivity.' value='' />\n",
+    "comments": "",
+    "x": 1078,
+    "y": 245,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "7c17985e.24b9a8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$mmridx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1062,
+    "y": 289,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "f9896c6a.7a3708"
+      ]
+    ]
+  },
+  {
+    "id": "f9896c6a.7a3708",
+    "type": "outcome",
+    "name": "connectivity",
+    "xml": "<outcome value='connectivity'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1245.28564453125,
+    "y": 288.82177734375,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "30ebd3e5.770cf4"
+      ]
+    ]
+  },
+  {
+    "id": "30ebd3e5.770cf4",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 273,
+    "y": 394,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "82504752.c08ad8"
+      ]
+    ]
+  },
+  {
+    "id": "82504752.c08ad8",
+    "type": "save",
+    "name": "get connectivity from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$mmridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.mmrconnectivity\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 480,
+    "y": 394,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "5f90d2a5.9f7054",
+        "65dc53f7.8e7784",
+        "1a9e510a.adb4e7"
+      ]
+    ]
+  },
+  {
+    "id": "5f90d2a5.9f7054",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 701,
+    "y": 367,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "87fec7ad.f202"
+      ]
+    ]
+  },
+  {
+    "id": "754c7814.0e8a58",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 855,
+    "y": 448,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "d131384d.b16ff8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 851.0623779296875,
+    "y": 403.8597717285156,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "65dc53f7.8e7784",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 688.490966796875,
+    "y": 403.57403564453125,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "d131384d.b16ff8"
+      ]
+    ]
+  },
+  {
+    "id": "1a9e510a.adb4e7",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 686,
+    "y": 447,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "754c7814.0e8a58"
+      ]
+    ]
+  },
+  {
+    "id": "ab4fd3e7.8abc6",
+    "type": "switchNode",
+    "name": "switch conn vlan same as curr ll",
+    "xml": "<!--<switch test=\"`$tmp.aai.all-connectivities.connectivity[$connidx].cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `\">-->\n<switch test=\"`$tmp.aai.mmrconnectivity.cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 285,
+    "y": 665,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "2c46c2f6.973bfe",
+        "85b72055.4d73f"
+      ]
+    ]
+  },
+  {
+    "id": "2c46c2f6.973bfe",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 496,
+    "y": 635,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "d5af698e.25e738"
+      ]
+    ]
+  },
+  {
+    "id": "85b72055.4d73f",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 494,
+    "y": 687,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "7ec9db69.7abb2c"
+      ]
+    ]
+  },
+  {
+    "id": "d5af698e.25e738",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 651,
+    "y": 636,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7ec9db69.7abb2c",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='connrelidx' start='0' end='`$tmp.aai.mmrconnectivity.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 678,
+    "y": 685,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "e28e2052.a958a",
+        "63bf8e12.beb788"
+      ]
+    ]
+  },
+  {
+    "id": "e28e2052.a958a",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 884,
+    "y": 685,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "f0e6ef1c.3db2d"
+      ]
+    ]
+  },
+  {
+    "id": "f0e6ef1c.3db2d",
+    "type": "outcome",
+    "name": "vpn-binding",
+    "xml": "<outcome value='vpn-binding'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1048.28564453125,
+    "y": 684.82177734375,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "402026e2.423eb8"
+      ]
+    ]
+  },
+  {
+    "id": "87fec7ad.f202",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 856,
+    "y": 362,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "ab4fd3e7.8abc6",
+        "8d8a1b19.f80f38"
+      ]
+    ]
+  },
+  {
+    "id": "63bf8e12.beb788",
+    "type": "set",
+    "name": "unset tmp.aai.mmrvpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.mmrvpn-binding.' value='' />\n",
+    "comments": "",
+    "x": 914,
+    "y": 623,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "402026e2.423eb8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 273,
+    "y": 804,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "d52369a5.e7da38"
+      ]
+    ]
+  },
+  {
+    "id": "d52369a5.e7da38",
+    "type": "switchNode",
+    "name": "switch vpnNameToSearch",
+    "xml": "<switch test='`$vpnNameToSearch == $tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to-property[0].property-value`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 478,
+    "y": 805,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "24a01305.62ce64"
+      ]
+    ]
+  },
+  {
+    "id": "24a01305.62ce64",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 658,
+    "y": 805,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "9ddcd462.0017f"
+      ]
+    ]
+  },
+  {
+    "id": "9ddcd462.0017f",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 779,
+    "y": 802,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "fa3ceefe.cff1a",
+        "4d6041d5.dfff38"
+      ]
+    ]
+  },
+  {
+    "id": "fa3ceefe.cff1a",
+    "type": "set",
+    "name": "set foundVpnName",
+    "xml": "<set>\n<parameter name='foundVpnName' value='true' />\n",
+    "comments": "",
+    "x": 944,
+    "y": 771,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "4d6041d5.dfff38",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 907,
+    "y": 816,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "cfff50b2.fe63",
+    "type": "switchNode",
+    "name": "switch foundVpnName",
+    "xml": "<switch test='`$foundVpnName`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1103,
+    "y": 356,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "778f874f.3433e"
+      ]
+    ]
+  },
+  {
+    "id": "778f874f.3433e",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1283,
+    "y": 356,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "4c396aea.bd0a8c"
+      ]
+    ]
+  },
+  {
+    "id": "4c396aea.bd0a8c",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 1417,
+    "y": 357,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "8d8a1b19.f80f38",
+    "type": "record",
+    "name": "record tmp.pce-src and dst node",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$tmp.aai.mmrconnectivity.cvlan`\"/>\n<parameter name=\"field2\" value=\"`$tmp.aai.network-route-LEAF.logical-interface-id`\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 290,
+    "y": 599,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      []
+    ]
+  }
+]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index 6af72c1..5c897a5 100755 (executable)
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -299,3 +299,4 @@ GENERIC-RESOURCE-API cll-vnf-topology-operation-find-maximum-used-tpn ${project.
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-delete ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-modify ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-delete-VPNBs ${project.version} sync
+GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-searchVpnName ${project.version} sync

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
index 9a35f12..b205786 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
@@ -565,7 +565,7 @@
                                                                                     <outcome value='success'>
                                                                                         <block atomic="true">
                                                                                             <set>
-                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />
+                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
                                                                                             </set>
                                                                                         </block>
                                                                                     </outcome>
@@ -828,7 +828,7 @@
                                                                                     <outcome value='success'>
                                                                                         <block atomic="true">
                                                                                             <set>
-                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />
+                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
                                                                                             </set>
                                                                                         </block>
                                                                                     </outcome>

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
index 0fc5dcd..b928dba 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
@@ -492,7 +492,7 @@
                                                    $param-prefix-domainA-pnfName[8]`" />\r
                                                                                                         <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->\r
                                                                                                         <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />\r
-                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />\r
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`" />\r
                                                                                                         <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />\r
                                                                                                     </set>\r
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
@@ -693,7 +693,7 @@
                                                    $param-prefix-domainB-pnfName[8]`" />\r
                                                                                                         <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->\r
                                                                                                         <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />\r
-                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />\r
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />\r
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />\r
                                                                                                     </set>\r
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>\r
@@ -1342,19 +1342,29 @@
                                                                                                                                                                     <outcome value='true'>\r
                                                                                                                                                                         <block atomic='true'>\r
                                                                                                                                                                             <set>\r
-                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="" />\r
+                                                                                                                                                                                <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />\r
                                                                                                                                                                             </set>\r
-                                                                                                                                                                            <set>\r
-                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />\r
-                                                                                                                                                                            </set>\r
-                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\r
-                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\r
-                                                                                                                                                                                <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\r
-                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\r
-                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\r
-                                                                                                                                                                                <parameter name='operational-status' value='Modified' />\r
-                                                                                                                                                                            </update>\r
+                                                                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>\r
+                                                                                                                                                                            <switch test="`$foundVpnName`">\r
+                                                                                                                                                                                <outcome value='true'>\r
+                                                                                                                                                                                    <block atomic='true'>\r
+                                                                                                                                                                                        <set>\r
+                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="" />\r
+                                                                                                                                                                                        </set>\r
+                                                                                                                                                                                        <set>\r
+                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />\r
+                                                                                                                                                                                        </set>\r
+                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\r
+                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\r
+                                                                                                                                                                                            <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\r
+                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\r
+                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\r
+                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />\r
+                                                                                                                                                                                        </update>\r
+                                                                                                                                                                                    </block>\r
+                                                                                                                                                                                </outcome>\r
+                                                                                                                                                                            </switch>\r
                                                                                                                                                                         </block>\r
                                                                                                                                                                     </outcome>\r
                                                                                                                                                                     <outcome value='false'></outcome>\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
index dcc3d69..de31109 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
@@ -492,7 +492,7 @@
                                                    $param-prefix-domainA-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
-                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`" />
                                                                                                         <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
                                                                                                     </set>
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
@@ -693,7 +693,7 @@
                                                    $param-prefix-domainB-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
-                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
                                                                                                     </set>
                                                                                                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
@@ -973,19 +973,29 @@
                                                                                                                                                                 <outcome value='true'>
                                                                                                                                                                     <block atomic='true'>
                                                                                                                                                                         <set>
-                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                            <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
                                                                                                                                                                         </set>
-                                                                                                                                                                        <set>
-                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                                                                                                                                        </set>
-                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
-                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />
-                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                        </update>
+                                                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+                                                                                                                                                                        <switch test="`$foundVpnName`">
+                                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                                <block atomic='true'>
+                                                                                                                                                                                    <set>
+                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                    </set>
+                                                                                                                                                                                    <set>
+                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                    </set>
+                                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                        <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                        <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />
+                                                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                    </update>
+                                                                                                                                                                                </block>
+                                                                                                                                                                            </outcome>
+                                                                                                                                                                        </switch>
                                                                                                                                                                     </block>
                                                                                                                                                                 </outcome>
                                                                                                                                                                 <outcome value='false'></outcome>

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml
index bb86aac..58104d5 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml
@@ -9,6 +9,9 @@
             <set>
                 <parameter name='tmp.aai.ROOT.connectivity.' value="" />
             </set>
+            <set>
+                <parameter name='tmp.aai.helper-root-all-connectivities.' value="" />
+            </set>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                           resource="connectivities"
                           key="selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'"

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml
index 6e27938..8749801 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml
@@ -9,6 +9,9 @@
             <set>
                 <parameter name='tmp.the-connectivity.' value="" />
             </set>
+            <set>
+                <parameter name='tmp.aai.helper-all-connectivities.' value="" />
+            </set>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                           resource="connectivities"
                           key="selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'"
@@ -18,19 +21,51 @@
                     <block atomic="true">
                         <for index='helpconnidx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity_length`' >
                             <block atomic='true'>
-                                <switch test="`$tmp.current-provider-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`">
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                    <parameter name="logger" value="message-log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`"/>
+                                </record>
+                                <switch test='`length($tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id) == 0`'>
                                     <outcome value='true'>
-                                        <block atomic='true'>
-                                            <switch test="`$tmp.current-cvlan-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].cvlan`">
+                                        <block></block>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <block>
+                                            <switch test="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id != ''`">
+                                                <outcome value='false'>
+                                                    <block></block>
+                                                </outcome>
                                                 <outcome value='true'>
-                                                    <block atomic='true'>
-                                                        <set>
-                                                            <parameter name='found-connectivity' value="true" />
-                                                        </set>
-                                                        <set>
-                                                            <parameter name='tmp.the-connectivity.' value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].`" />
-                                                        </set>
-                                                        <break/>
+                                                    <block>
+                                                        <switch test="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].vpn-type != 'mdsc' `">
+                                                            <outcome value='false'>
+                                                                <block></block>
+                                                            </outcome>
+                                                            <outcome value='true'>
+                                                                <block>
+                                                                    <switch test="`$tmp.current-provider-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`">
+                                                                        <outcome value='true'>
+                                                                            <block atomic='true'>
+                                                                                <switch test="`$tmp.current-cvlan-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].cvlan`">
+                                                                                    <outcome value='true'>
+                                                                                        <block atomic='true'>
+                                                                                            <set>
+                                                                                                <parameter name='found-connectivity' value="true" />
+                                                                                            </set>
+                                                                                            <set>
+                                                                                                <parameter name='tmp.the-connectivity.' value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].`" />
+                                                                                            </set>
+                                                                                            <break/>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
                                                     </block>
                                                 </outcome>
                                             </switch>

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.xml
index a9562ab..3ad3c86 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.xml
@@ -144,6 +144,7 @@
                                                                                                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                                                                                                                                             <parameter name="filename" value="`$filenamebb`" />
                                                                                                                                         </execute>
+                                                                                                                                        <break/>
                                                                                                                                     </block>
                                                                                                                                 </outcome>
                                                                                                                             </switch>
@@ -190,6 +191,7 @@
                                                             </outcome>
                                                         </switch>
                                                     </for>
+                                                    <break/>
                                                 </block>
                                             </outcome>
                                         </switch>

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
index 76cea19..d01140f 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
@@ -492,7 +492,7 @@
                                                    $param-prefix-domainA-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
-                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`" />
                                                                                                         <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
                                                                                                     </set>
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
@@ -693,7 +693,7 @@
                                                    $param-prefix-domainB-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
-                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
                                                                                                     </set>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>
@@ -1127,64 +1127,74 @@
                                                                                                                                                                         <outcome value='true'>
                                                                                                                                                                             <block atomic='true'>
                                                                                                                                                                                 <set>
-                                                                                                                                                                                    <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                    <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
                                                                                                                                                                                 </set>
-                                                                                                                                                                                <set>
-                                                                                                                                                                                    <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                                                                                                                                                </set>
-                                                                                                                                                                                <for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >
-                                                                                                                                                                                    <switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>
-                                                                                                                                                                                        <outcome value='connectivity'>
-                                                                                                                                                                                            <block atomic="true">
-                                                                                                                                                                                                <set>
-                                                                                                                                                                                                    <parameter name='tmp.the-connectivity.' value='' />
-                                                                                                                                                                                                </set>
-                                                                                                                                                                                                <set>
-                                                                                                                                                                                                    <parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />
-                                                                                                                                                                                                </set>
-                                                                                                                                                                                            </block>
-                                                                                                                                                                                        </outcome>
-                                                                                                                                                                                    </switch>
-                                                                                                                                                                                </for>
-                                                                                                                                                                                <switch test="`$tmp.isBwIncreased`">
+                                                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+                                                                                                                                                                                <switch test="`$foundVpnName`">
                                                                                                                                                                                     <outcome value='true'>
                                                                                                                                                                                         <block atomic='true'>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
-                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                            </update>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                            </update>
-                                                                                                                                                                                        </block>
-                                                                                                                                                                                    </outcome>
-                                                                                                                                                                                    <outcome value='false'>
-                                                                                                                                                                                        <block atomic='true'>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
-                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                            </update>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                            </update>
+                                                                                                                                                                                            <set>
+                                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                            </set>
+                                                                                                                                                                                            <set>
+                                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                            </set>
+                                                                                                                                                                                            <for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >
+                                                                                                                                                                                                <switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>
+                                                                                                                                                                                                    <outcome value='connectivity'>
+                                                                                                                                                                                                        <block atomic="true">
+                                                                                                                                                                                                            <set>
+                                                                                                                                                                                                                <parameter name='tmp.the-connectivity.' value='' />
+                                                                                                                                                                                                            </set>
+                                                                                                                                                                                                            <set>
+                                                                                                                                                                                                                <parameter name='tmp.the-connectivity.connectivity-id' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />
+                                                                                                                                                                                                            </set>
+                                                                                                                                                                                                        </block>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                </switch>
+                                                                                                                                                                                            </for>
+                                                                                                                                                                                            <switch test="`$tmp.isBwIncreased`">
+                                                                                                                                                                                                <outcome value='true'>
+                                                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                            <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                            <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                            <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                            <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                    </block>
+                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                                <outcome value='false'>
+                                                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                            <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                            <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                            <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                            <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                    </block>
+                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                            </switch>
                                                                                                                                                                                         </block>
                                                                                                                                                                                     </outcome>
                                                                                                                                                                                 </switch>
@@ -1611,6 +1621,9 @@
                                                                                                                                                         <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
                                                                                                                                                     </set>
                                                                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.aai.all-vpn-bindings.' value='' />
+                                                                                                                                                    </set>
                                                                                                                                                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                                                                                                                                                   resource="vpn-bindings"
                                                                                                                                                                   key="selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings"
@@ -1625,19 +1638,29 @@
                                                                                                                                                                                 <outcome value='true'>
                                                                                                                                                                                     <block atomic='true'>
                                                                                                                                                                                         <set>
-                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="" />
-                                                                                                                                                                                        </set>
-                                                                                                                                                                                        <set>
-                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                            <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
                                                                                                                                                                                         </set>
-                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                            <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
-                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
-                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                        </update>
+                                                                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+                                                                                                                                                                                        <switch test="`$foundVpnName`">
+                                                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                                                <block atomic='true'>
+                                                                                                                                                                                                    <set>
+                                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                                    </set>
+                                                                                                                                                                                                    <set>
+                                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                                    </set>
+                                                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                        <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
+                                                                                                                                                                                                        <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                        <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
+                                                                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                    </update>
+                                                                                                                                                                                                </block>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                        </switch>
                                                                                                                                                                                     </block>
                                                                                                                                                                                 </outcome>
                                                                                                                                                                                 <outcome value='false'></outcome>

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.xml
new file mode 100644 (file)
index 0000000..724f306
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.xml
@@ -0,0 +1,85 @@
+<service-logic
+        xmlns='http://www.onap.org/sdnc/svclogic'
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='foundVpnName' value='false' />
+            </set>
+            <for silentFailure='true' index='mmridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >
+                <set>
+                    <parameter name='tmp.aai.mmrconnectivity.' value='' />
+                </set>
+                <switch test='`$middle-man-conn.relationship-list.relationship[$mmridx].related-to`'>
+                    <outcome value='connectivity'>
+                        <block atomic="true">
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                          resource="connectivity"
+                                          key="connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$mmridx].relationship-data[0].relationship-value"
+                                          local-only="false"
+                                          pfx="tmp.aai.mmrconnectivity" >
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="`$tmp.aai.mmrconnectivity.cvlan`"/>
+                                            <parameter name="field2" value="`$tmp.aai.network-route-LEAF.logical-interface-id`"/>
+                                        </record>
+                                        <!--<switch test="`$tmp.aai.all-connectivities.connectivity[$connidx].cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `">-->
+                                        <switch test="`$tmp.aai.mmrconnectivity.cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `">
+                                            <outcome value='false'>
+                                                <block></block>
+                                            </outcome>
+                                            <outcome value='true'>
+                                                <for silentFailure='true' index='connrelidx' start='0' end='`$tmp.aai.mmrconnectivity.relationship-list.relationship_length`' >
+                                                    <set>
+                                                        <parameter name='tmp.aai.mmrvpn-binding.' value='' />
+                                                    </set>
+                                                    <switch test='`$tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to`'>
+                                                        <outcome value='vpn-binding'>
+                                                            <block atomic="true">
+                                                                <switch test='`$vpnNameToSearch == $tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to-property[0].property-value`'>
+                                                                    <outcome value='true'>
+                                                                        <block>
+                                                                            <set>
+                                                                                <parameter name='foundVpnName' value='true' />
+                                                                            </set>
+                                                                            <break/>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </outcome>
+                                        </switch>
+                                    </block>
+                                </outcome>
+                                <outcome value='not-found'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='error-code' value='' />
+                                        <parameter name='error-message' value='' />
+                                    </return>
+                                </outcome>
+                            </get-resource>
+                        </block>
+                    </outcome>
+                </switch>
+                <switch test='`$foundVpnName`'>
+                    <outcome value='true'>
+                        <break/>
+                    </outcome>
+                </switch>
+            </for>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file