From e05908853cac402da69c069366cd8d16d6667d7e Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Mon, 9 May 2022 21:24:15 -0400
Subject: Making sure not to use the same CLL instance name for all endpoints'
 description attribute.

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

Former-commit-id: ae70d99c5216530159e830a0eee1d40cd95175f1
---
 ...ogy-operation-cll-F1-Activate-w-Protection.json | 2632 ++++----
 ...cll-vnf-topology-operation-cll-F1-Activate.json | 2644 ++++----
 ...ll-vnf-topology-operation-cll-create-clean.json | 5348 +++++++--------
 ...-API_cll-vnf-topology-operation-cll-modify.json | 7122 ++++++++++----------
 4 files changed, 8873 insertions(+), 8873 deletions(-)

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

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
index 42f3ac63..c96583a1 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
@@ -1,199 +1,199 @@
 [
   {
-    "id": "2c2eaaa6.595c6e",
+    "id": "10a422cf.1eeed5",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 533.3333129882812,
-    "y": 388.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 676,
+    "y": 287,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "b93bc255.06d818",
-        "e7d58f90.50f7a",
-        "d44dcc0c.074358"
+        "b0a990da.c03088",
+        "b7ea05a6.0fe86",
+        "2c56ab13.0959e4"
       ]
     ]
   },
   {
-    "id": "b93bc255.06d818",
+    "id": "b0a990da.c03088",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 721.3333129882812,
-    "y": 401.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 864,
+    "y": 300,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "351735cd.d4c382"
+        "455891ac.f0409"
       ]
     ]
   },
   {
-    "id": "e7d58f90.50f7a",
+    "id": "b7ea05a6.0fe86",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 728.8242492675781,
-    "y": 443.5740432739258,
-    "z": "88b99be5.091bf8",
+    "x": 871.4909362792969,
+    "y": 342.57403564453125,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "d44dcc0c.074358",
+    "id": "2c56ab13.0959e4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 719.3333129882812,
-    "y": 490.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 862,
+    "y": 389,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9f7438aa.cfa3f8"
+        "630bfd04.7da00c"
       ]
     ]
   },
   {
-    "id": "351735cd.d4c382",
+    "id": "455891ac.f0409",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 894.3333129882812,
-    "y": 399.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1037,
+    "y": 298,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6797a33f.6e9ecc"
+        "7e5b0143.2c92a8"
       ]
     ]
   },
   {
-    "id": "6797a33f.6e9ecc",
+    "id": "7e5b0143.2c92a8",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1123.3333129882812,
-    "y": 400.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1266,
+    "y": 299,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "181a770b.23d341"
+        "62dd4d08.7a116c"
       ]
     ]
   },
   {
-    "id": "181a770b.23d341",
+    "id": "62dd4d08.7a116c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1338.3333129882812,
-    "y": 401.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1481,
+    "y": 300,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "96414042.e1f2c8"
+        "7caf5b45.f9ab04"
       ]
     ]
   },
   {
-    "id": "e5c5abf.467ec58",
+    "id": "76f6230c.40e14c",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1592.3333129882812,
-    "y": 323.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1735,
+    "y": 222,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "71905208.3f5ca4",
-        "3be6bf3.b82124"
+        "a035fb12.104f38",
+        "a471cecf.79d2"
       ]
     ]
   },
   {
-    "id": "71905208.3f5ca4",
+    "id": "a035fb12.104f38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1809.3333129882812,
-    "y": 302.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1952,
+    "y": 201,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "96414042.e1f2c8"
+        "7caf5b45.f9ab04"
       ]
     ]
   },
   {
-    "id": "3be6bf3.b82124",
+    "id": "a471cecf.79d2",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1809.3333129882812,
-    "y": 351.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1952,
+    "y": 250,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "96414042.e1f2c8",
+    "id": "7caf5b45.f9ab04",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1993.3333129882812,
-    "y": 388.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 2136,
+    "y": 287,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "95dd5e61.027198",
-        "877d8b16.d3994",
-        "b3333886.2341"
+        "9e3d4f1.ef044b",
+        "1812ba90.3bec25",
+        "cefb7e41.dee868"
       ]
     ]
   },
   {
-    "id": "884050d1.040518",
+    "id": "82ff7ac2.5ab12",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 352.33331298828125,
-    "y": 129.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 495,
+    "y": 28,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d4acd14e.d29f88"
+        "60b5aea2.21792"
       ]
     ]
   },
   {
-    "id": "d4acd14e.d29f88",
+    "id": "60b5aea2.21792",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -201,3693 +201,3693 @@
     "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": 636.6190032958984,
-    "y": 190.23811626434326,
-    "z": "88b99be5.091bf8",
+    "x": 779.2856903076172,
+    "y": 89.23810863494873,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "659111a0.43dcc"
+        "414f5c44.935264"
       ]
     ]
   },
   {
-    "id": "659111a0.43dcc",
+    "id": "414f5c44.935264",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-F1-Activate-w-Protection",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate-w-Protection' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 642.7619171142578,
-    "y": 275.00003814697266,
-    "z": "88b99be5.091bf8",
+    "x": 785.4286041259766,
+    "y": 174.00003051757812,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "27f31a3d.0f29d6"
+        "90230fbe.1f78e8"
       ]
     ]
   },
   {
-    "id": "27f31a3d.0f29d6",
+    "id": "90230fbe.1f78e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 952.5713500976562,
-    "y": 266.6666946411133,
-    "z": "88b99be5.091bf8",
+    "x": 1095.238037109375,
+    "y": 165.66668701171875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2c2eaaa6.595c6e",
-        "cef7b9ce.1b3ba8",
-        "306cc859.5059d",
-        "5f84eccb.714dcc",
-        "3014f91f.87a3fe"
+        "10a422cf.1eeed5",
+        "c82b1b5b.8e5c4",
+        "476ddcd6.ba7404",
+        "cf6ce2f3.f820a",
+        "a8ba69c5.3110b8"
       ]
     ]
   },
   {
-    "id": "95dd5e61.027198",
+    "id": "9e3d4f1.ef044b",
     "type": "set",
     "name": "set tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 2210.3333129882812,
-    "y": 326.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 2353,
+    "y": 225,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e5ef1dc.853e7e",
+    "id": "9b274b59.c02fc",
     "type": "set",
     "name": "set attachment_param for OTN A",
     "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
     "comments": "",
-    "x": 4379.333312988281,
-    "y": 212.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4522,
+    "y": 111,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "28eb1f3b.b8157",
+    "id": "73b1b71.91a29c8",
     "type": "execute",
     "name": "execute RestApiCallNode Create OTN tunnel with token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4460.333312988281,
-    "y": 527.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4603,
+    "y": 426,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "1f9f84d9.8d553b",
-        "99de3b6c.89af8"
+        "bf94869d.abe8c",
+        "7e872687.f361d8"
       ]
     ]
   },
   {
-    "id": "1f9f84d9.8d553b",
+    "id": "bf94869d.abe8c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4769.833312988281,
-    "y": 496.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4912.5,
+    "y": 395,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d7492135.ad5fc8"
+        "70666b8b.cebd9c"
       ]
     ]
   },
   {
-    "id": "99de3b6c.89af8",
+    "id": "7e872687.f361d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4774.833312988281,
-    "y": 561.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4917.5,
+    "y": 460,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "76880ad0.6601a4"
+        "2f157928.a7cc26"
       ]
     ]
   },
   {
-    "id": "d7492135.ad5fc8",
+    "id": "70666b8b.cebd9c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
     "comments": "",
-    "x": 4945.833312988281,
-    "y": 496.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5088.5,
+    "y": 395,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "76880ad0.6601a4",
+    "id": "2f157928.a7cc26",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4941.333312988281,
-    "y": 561.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5084,
+    "y": 460,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "faa33d4e.9e9608",
+    "id": "2c68de8.698fe22",
     "type": "set",
     "name": "set sotn_value",
     "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
     "comments": "",
-    "x": 4324.833312988281,
-    "y": 781.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4467.5,
+    "y": 680,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "2bce125e.cf653e",
+    "id": "432e6fef.6bc3f",
     "type": "execute",
     "name": "execute RestApiCallNode Create ethernet Service without token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4478.833312988281,
-    "y": 829.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4621.5,
+    "y": 728,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "ca07acfa.a5fa68",
-        "90e419cc.31d64"
+        "4c8de07f.a04f7",
+        "1618ec6.a46fa94"
       ]
     ]
   },
   {
-    "id": "ca07acfa.a5fa68",
+    "id": "4c8de07f.a04f7",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4824.333312988281,
-    "y": 810.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4967,
+    "y": 709,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4bb3503a.663a88"
+        "74c74a6e.6269c4"
       ]
     ]
   },
   {
-    "id": "90e419cc.31d64",
+    "id": "1618ec6.a46fa94",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4828.333312988281,
-    "y": 850.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4971,
+    "y": 749,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d3e50925.f867c"
+        "1da4485d.51ad6"
       ]
     ]
   },
   {
-    "id": "4bb3503a.663a88",
+    "id": "74c74a6e.6269c4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
     "comments": "",
-    "x": 4982.333312988281,
-    "y": 810.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5125,
+    "y": 709,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d3e50925.f867c",
+    "id": "1da4485d.51ad6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4985.833312988281,
-    "y": 850.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5128.5,
+    "y": 749,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a6019d0e.791c3",
-        "1200fd09.b183c3"
+        "ee6915f8.624f38",
+        "90214377.544788"
       ]
     ]
   },
   {
-    "id": "a6019d0e.791c3",
+    "id": "ee6915f8.624f38",
     "type": "save",
     "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5316.333312988281,
-    "y": 815.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5459,
+    "y": 714,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "409f8a00.232b48",
+    "id": "838cdc3e.4f58e",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
     "comments": "",
-    "x": 5180.333312988281,
-    "y": 774.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5323,
+    "y": 673,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "1200fd09.b183c3",
+    "id": "90214377.544788",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5243.333312988281,
-    "y": 861.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5386,
+    "y": 760,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "d18efeb6.7196c8",
+    "id": "aa46b84e.3356a",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
     "comments": "",
-    "x": 4317.333312988281,
-    "y": 260.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4460,
+    "y": 159,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "3a9d4ff0.831a9",
+    "id": "d57f31e9.bb9eb",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 4343.333312988281,
-    "y": 377.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4486,
+    "y": 276,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9519eb20.e7bb98",
-        "5232e91a.5e69a",
-        "d4898e73.a749e8"
+        "33a92b4f.9380e4",
+        "f049b484.8a771",
+        "3592f024.f5a328"
       ]
     ]
   },
   {
-    "id": "9519eb20.e7bb98",
+    "id": "33a92b4f.9380e4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4538.833435058594,
-    "y": 329.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4681.5001220703125,
+    "y": 228,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4b08f17b.aadf2"
+        "14379d7c.41191b"
       ]
     ]
   },
   {
-    "id": "5232e91a.5e69a",
+    "id": "f049b484.8a771",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4530.833435058594,
-    "y": 384.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4673.5001220703125,
+    "y": 283,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "b87b6903.ae28e"
+        "53127e40.7f1108"
       ]
     ]
   },
   {
-    "id": "4b08f17b.aadf2",
+    "id": "14379d7c.41191b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4683.215759277344,
-    "y": 328.65567779541016,
-    "z": "88b99be5.091bf8",
+    "x": 4825.8824462890625,
+    "y": 227.65567016601562,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "797a34c3.7e821c"
+        "88ec362d.bac6c"
       ]
     ]
   },
   {
-    "id": "85c5906d.e6a79",
+    "id": "5831eff3.ba3a08",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5265.333312988281,
-    "y": 331.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5408,
+    "y": 230,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "937745a8.a82728"
+        "ea688f7c.199be"
       ]
     ]
   },
   {
-    "id": "797a34c3.7e821c",
+    "id": "88ec362d.bac6c",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4867.333312988281,
-    "y": 327.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5010,
+    "y": 226,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bb125276.4bcb68"
+        "280d7047.234eb8"
       ]
     ]
   },
   {
-    "id": "bb125276.4bcb68",
+    "id": "280d7047.234eb8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5062.333312988281,
-    "y": 327.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5205,
+    "y": 226,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "85c5906d.e6a79"
+        "5831eff3.ba3a08"
       ]
     ]
   },
   {
-    "id": "d4898e73.a749e8",
+    "id": "3592f024.f5a328",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4535.833435058594,
-    "y": 441.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4678.5001220703125,
+    "y": 340,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "54ed711f.a7d8c8"
+        "5b037f74.b971e"
       ]
     ]
   },
   {
-    "id": "54ed711f.a7d8c8",
+    "id": "5b037f74.b971e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4687.833435058594,
-    "y": 442.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4830.5001220703125,
+    "y": 341,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "b87b6903.ae28e",
+    "id": "53127e40.7f1108",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4698.833435058594,
-    "y": 385.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4841.5001220703125,
+    "y": 284,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d6320d33.cae9b",
+    "id": "9d5c763c.8825a8",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5650.333312988281,
-    "y": 344.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5793,
+    "y": 243,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bdc01a41.5b11d",
-        "19bd6ca2.3b24bb",
-        "3d79a005.c3b89"
+        "14eb5ad.a3dc725",
+        "4c145e69.4439a8",
+        "6146c55d.b50c7c"
       ]
     ]
   },
   {
-    "id": "937745a8.a82728",
+    "id": "ea688f7c.199be",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5444.333312988281,
-    "y": 331.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5587,
+    "y": 230,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "624c597d.18779",
-        "d6320d33.cae9b"
+        "2ce20510.f1ea8a",
+        "9d5c763c.8825a8"
       ]
     ]
   },
   {
-    "id": "624c597d.18779",
+    "id": "2ce20510.f1ea8a",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5680.333312988281,
-    "y": 292.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5823,
+    "y": 191,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "bdc01a41.5b11d",
+    "id": "14eb5ad.a3dc725",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5860.333312988281,
-    "y": 335.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6003,
+    "y": 234,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "c6702adf.a8a4e8"
+        "95245b22.847e1"
       ]
     ]
   },
   {
-    "id": "19bd6ca2.3b24bb",
+    "id": "4c145e69.4439a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5852.333312988281,
-    "y": 390.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5995,
+    "y": 289,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "14b63752.13b4e1"
+        "8e4747a4.d218e8"
       ]
     ]
   },
   {
-    "id": "3d79a005.c3b89",
+    "id": "6146c55d.b50c7c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5857.333312988281,
-    "y": 447.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6000,
+    "y": 346,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "52bfc859.8923c8"
+        "6067fdf7.24ee8c"
       ]
     ]
   },
   {
-    "id": "52bfc859.8923c8",
+    "id": "6067fdf7.24ee8c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 6009.333312988281,
-    "y": 448.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6152,
+    "y": 347,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "14b63752.13b4e1",
+    "id": "8e4747a4.d218e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 6020.333312988281,
-    "y": 393.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6163,
+    "y": 292,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c6702adf.a8a4e8",
+    "id": "95245b22.847e1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6004.715637207031,
-    "y": 332.65567779541016,
-    "z": "88b99be5.091bf8",
+    "x": 6147.38232421875,
+    "y": 231.65567016601562,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d92f12f8.15c348"
+        "37f78c4b.9778a4"
       ]
     ]
   },
   {
-    "id": "d92f12f8.15c348",
+    "id": "37f78c4b.9778a4",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 6219.333312988281,
-    "y": 329.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6362,
+    "y": 228,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "60926b96.be818c",
+    "id": "105d488e.a9be97",
     "type": "set",
     "name": "set attachment_param for OTN B",
     "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
     "comments": "",
-    "x": 3786.3333129882812,
-    "y": 1669.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3929,
+    "y": 1568,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c947459e.872f3",
+    "id": "f1912cb6.f277c8",
     "type": "execute",
     "name": "execute RestApiCallNode Create OTN tunnel with token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3849.3333129882812,
-    "y": 1998.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3992,
+    "y": 1897,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a1124e38.08b2b8",
-        "626f4392.b77cf4"
+        "97bce09c.8125c",
+        "5d55eda4.32d174"
       ]
     ]
   },
   {
-    "id": "a1124e38.08b2b8",
+    "id": "97bce09c.8125c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4144.833312988281,
-    "y": 1965.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4287.5,
+    "y": 1864,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9662ab69.840d68"
+        "f47c0fd1.452808"
       ]
     ]
   },
   {
-    "id": "626f4392.b77cf4",
+    "id": "5d55eda4.32d174",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4149.833312988281,
-    "y": 2030.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4292.5,
+    "y": 1929,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "dc33d36b.4bb068"
+        "acffe827.dd3a1"
       ]
     ]
   },
   {
-    "id": "9662ab69.840d68",
+    "id": "f47c0fd1.452808",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
     "comments": "",
-    "x": 4312.833312988281,
-    "y": 1965.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4455.5,
+    "y": 1864,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "dc33d36b.4bb068",
+    "id": "acffe827.dd3a1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4323.333312988281,
-    "y": 2030.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4466,
+    "y": 1929,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "785f8bef.d4b92c",
+    "id": "b25ffa4f.8d40a",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
     "comments": "",
-    "x": 3725.3333129882812,
-    "y": 1726.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3868,
+    "y": 1625,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d7561682.896a3",
+    "id": "cf848b89.db6cc",
     "type": "get-resource",
     "name": "get-resource dst pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3745.3333129882812,
-    "y": 1823.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3888,
+    "y": 1722,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "585f4a29.5a089c",
-        "beb39570.8572c",
-        "251a4de6.33c8aa"
+        "3599c19a.ddebee",
+        "34a9c77d.fd737",
+        "5dbb4cb9.edac8c"
       ]
     ]
   },
   {
-    "id": "585f4a29.5a089c",
+    "id": "3599c19a.ddebee",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3947.8334350585938,
-    "y": 1776.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4090.5001220703125,
+    "y": 1675,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "52dfa280.06ea3c"
+        "cbdb928e.2f6908"
       ]
     ]
   },
   {
-    "id": "beb39570.8572c",
+    "id": "34a9c77d.fd737",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3939.8334350585938,
-    "y": 1831.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4082.5001220703125,
+    "y": 1730,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d9bfad39.7bd668"
+        "aab7df57.177ae"
       ]
     ]
   },
   {
-    "id": "52dfa280.06ea3c",
+    "id": "cbdb928e.2f6908",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4092.2157592773438,
-    "y": 1773.6556777954102,
-    "z": "88b99be5.091bf8",
+    "x": 4234.8824462890625,
+    "y": 1672.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "3ad5a325.5b1584"
+        "5b70bc96.d9f024"
       ]
     ]
   },
   {
-    "id": "3ad5a325.5b1584",
+    "id": "5b70bc96.d9f024",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4276.333312988281,
-    "y": 1788.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4419,
+    "y": 1687,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "66e3a12c.e2e618"
+        "4020371.e4e7d48"
       ]
     ]
   },
   {
-    "id": "251a4de6.33c8aa",
+    "id": "5dbb4cb9.edac8c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3944.8334350585938,
-    "y": 1888.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4087.5001220703125,
+    "y": 1787,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "56e3abe.0b3e154"
+        "cb2099e3.7f1de"
       ]
     ]
   },
   {
-    "id": "56e3abe.0b3e154",
+    "id": "cb2099e3.7f1de",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4096.833435058594,
-    "y": 1889.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4239.5001220703125,
+    "y": 1788,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d9bfad39.7bd668",
+    "id": "aab7df57.177ae",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4107.833435058594,
-    "y": 1834.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4250.5001220703125,
+    "y": 1733,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "b422b9dc.94e76",
+    "id": "b4cfde0a.4da658",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4674.333312988281,
-    "y": 1792.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4817,
+    "y": 1691,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "79873b94.5791e4"
+        "f4ed5c16.5bfe98"
       ]
     ]
   },
   {
-    "id": "66e3a12c.e2e618",
+    "id": "4020371.e4e7d48",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4471.333312988281,
-    "y": 1788.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4614,
+    "y": 1687,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "b422b9dc.94e76"
+        "b4cfde0a.4da658"
       ]
     ]
   },
   {
-    "id": "8c738542.45973",
+    "id": "5139fea9.434dc8",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5059.333312988281,
-    "y": 1791.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5202,
+    "y": 1690,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bed842bc.70d158",
-        "9fccfde7.5bd058",
-        "42496faf.cc3318"
+        "d7e660a5.61d688",
+        "5cb5ba76.7f8a6c",
+        "f188d950.fea538"
       ]
     ]
   },
   {
-    "id": "79873b94.5791e4",
+    "id": "f4ed5c16.5bfe98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4851.333312988281,
-    "y": 1784.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4994,
+    "y": 1683,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4d8f65c6.26fcac",
-        "8c738542.45973"
+        "5d010c90.067a14",
+        "5139fea9.434dc8"
       ]
     ]
   },
   {
-    "id": "4d8f65c6.26fcac",
+    "id": "5d010c90.067a14",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5089.333312988281,
-    "y": 1739.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5232,
+    "y": 1638,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "8a854ad6.1d148",
+    "id": "9b19cdfe.3fc3d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5418.333312988281,
-    "y": 1895.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5561,
+    "y": 1794,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "9b1912ba.26a3f8",
+    "id": "c60dd4d0.e8d36",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5429.333312988281,
-    "y": 1840.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5572,
+    "y": 1739,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e79aefeb.ae2d8",
+    "id": "285fdf09.377c58",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5413.715637207031,
-    "y": 1779.6556777954102,
-    "z": "88b99be5.091bf8",
+    "x": 5556.38232421875,
+    "y": 1678.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9fa1b8fd.2344f"
+        "98960d3c.5507d"
       ]
     ]
   },
   {
-    "id": "9fa1b8fd.2344f",
+    "id": "98960d3c.5507d",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5628.333312988281,
-    "y": 1776.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5771,
+    "y": 1675,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "bed842bc.70d158",
+    "id": "d7e660a5.61d688",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5269.333312988281,
-    "y": 1782.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5412,
+    "y": 1681,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e79aefeb.ae2d8"
+        "285fdf09.377c58"
       ]
     ]
   },
   {
-    "id": "9fccfde7.5bd058",
+    "id": "5cb5ba76.7f8a6c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5261.333312988281,
-    "y": 1837.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5404,
+    "y": 1736,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9b1912ba.26a3f8"
+        "c60dd4d0.e8d36"
       ]
     ]
   },
   {
-    "id": "42496faf.cc3318",
+    "id": "f188d950.fea538",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5266.333312988281,
-    "y": 1894.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5409,
+    "y": 1793,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "8a854ad6.1d148"
+        "9b19cdfe.3fc3d8"
       ]
     ]
   },
   {
-    "id": "afc78578.3291",
+    "id": "4f2225d8.9c49ec",
     "type": "switchNode",
     "name": "switch vpn-binding has dst-access-ltp",
     "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3300.3333129882812,
-    "y": 740.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3443,
+    "y": 639,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "44cf1bd6.cdf99c",
-        "619a5ca0.cdbc04"
+        "d58501ac.39534",
+        "2fb4f475.808574"
       ]
     ]
   },
   {
-    "id": "44cf1bd6.cdf99c",
+    "id": "d58501ac.39534",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3514.3333129882812,
-    "y": 777.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3657,
+    "y": 676,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "357cc1f0.bc9fae"
+        "41d82fae.a5867"
       ]
     ]
   },
   {
-    "id": "619a5ca0.cdbc04",
+    "id": "2fb4f475.808574",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3516.3333129882812,
-    "y": 715.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3659,
+    "y": 614,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "582aaedf.79cf78"
+        "918c203c.df9608"
       ]
     ]
   },
   {
-    "id": "357cc1f0.bc9fae",
+    "id": "41d82fae.a5867",
     "type": "switchNode",
     "name": "switch vpn-binding has src-access-ltp",
     "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3094.3333129882812,
-    "y": 2020.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3237,
+    "y": 1919,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "234b26f6.c2476a",
-        "5654d12.c509b3"
+        "5075f0ba.d591f8",
+        "d426d492.2d277"
       ]
     ]
   },
   {
-    "id": "234b26f6.c2476a",
+    "id": "5075f0ba.d591f8",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3347.3333129882812,
-    "y": 2054.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3490,
+    "y": 1953,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "77779b01.5bda2c"
+        "e38a9aed.8397b"
       ]
     ]
   },
   {
-    "id": "5654d12.c509b3",
+    "id": "d426d492.2d277",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3347.3333129882812,
-    "y": 1998.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3490,
+    "y": 1897,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "49e07205.df1904"
+        "16742fe3.bdb1e8"
       ]
     ]
   },
   {
-    "id": "77779b01.5bda2c",
+    "id": "e38a9aed.8397b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3498.3333129882812,
-    "y": 2054.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3641,
+    "y": 1953,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "fc88d512.b039f8",
+    "id": "5d106c04.0c1bfc",
     "type": "set",
     "name": "set vpn-bindingA and connectivityA",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
     "comments": "",
-    "x": 4374.333312988281,
-    "y": 152.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4517,
+    "y": 51,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "6082a62.95d37d8",
+    "id": "ff76ad24.0c9b6",
     "type": "set",
     "name": "set vpn-bindingB and connectivityB",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
     "comments": "",
-    "x": 3782.3333129882812,
-    "y": 1611.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3925,
+    "y": 1510,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7f468ae0.55d61c",
+    "id": "a35804af.f7d858",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4065.3333129882812,
-    "y": 409.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4208,
+    "y": 308,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "fc88d512.b039f8",
-        "e5ef1dc.853e7e",
-        "d18efeb6.7196c8",
-        "3a9d4ff0.831a9",
-        "28eb1f3b.b8157",
-        "20794036.3e0d98",
-        "5a5b3fd3.939fa",
-        "eb39e6d9.695df8"
+        "5d106c04.0c1bfc",
+        "9b274b59.c02fc",
+        "aa46b84e.3356a",
+        "d57f31e9.bb9eb",
+        "73b1b71.91a29c8",
+        "8951fa6a.a6da3",
+        "46bfac70.a8d9fc",
+        "d22b47c.48051b8"
       ]
     ]
   },
   {
-    "id": "49e07205.df1904",
+    "id": "16742fe3.bdb1e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3498.3333129882812,
-    "y": 1997.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3641,
+    "y": 1896,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6082a62.95d37d8",
-        "60926b96.be818c",
-        "785f8bef.d4b92c",
-        "d7561682.896a3",
-        "c947459e.872f3",
-        "33be6bd8.7ec864",
-        "7832f278.b4880c",
-        "cc8c0809.c4ad6"
+        "ff76ad24.0c9b6",
+        "105d488e.a9be97",
+        "b25ffa4f.8d40a",
+        "cf848b89.db6cc",
+        "f1912cb6.f277c8",
+        "7bb669b7.d54818",
+        "bfef7878.c9996",
+        "fc2523d9.c5b768"
       ]
     ]
   },
   {
-    "id": "3bec7c9e.0c31a4",
+    "id": "b91faaf4.9b239",
     "type": "set",
     "name": "set sotn_value",
     "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
     "comments": "",
-    "x": 3736.3333129882812,
-    "y": 2296.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3879,
+    "y": 2195,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "66e73857.3d0e78",
+    "id": "332b3c8d.6566fc",
     "type": "execute",
     "name": "execute RestApiCallNode Create ethernet Service without token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3890.3333129882812,
-    "y": 2344.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4033,
+    "y": 2243,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9ba2be1f.f4daf",
-        "1b19ccdb.027f4b"
+        "f1ea3ac9.246e38",
+        "629d98b3.63b55"
       ]
     ]
   },
   {
-    "id": "9ba2be1f.f4daf",
+    "id": "f1ea3ac9.246e38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4235.833312988281,
-    "y": 2325.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4378.5,
+    "y": 2224,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9032db4e.fba99"
+        "d4e7ca44.3afb58"
       ]
     ]
   },
   {
-    "id": "1b19ccdb.027f4b",
+    "id": "629d98b3.63b55",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4239.833312988281,
-    "y": 2365.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4382.5,
+    "y": 2264,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2bcc0072.d2bc6"
+        "cda78bf5.1aa53"
       ]
     ]
   },
   {
-    "id": "9032db4e.fba99",
+    "id": "d4e7ca44.3afb58",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
     "comments": "",
-    "x": 4393.833312988281,
-    "y": 2325.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4536.5,
+    "y": 2224,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "2bcc0072.d2bc6",
+    "id": "cda78bf5.1aa53",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4397.333312988281,
-    "y": 2365.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4540,
+    "y": 2264,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "45d30eee.bf1db8",
-        "a53e3184.87caf8"
+        "d94da46.8513a58",
+        "80579be4.10d908"
       ]
     ]
   },
   {
-    "id": "45d30eee.bf1db8",
+    "id": "d94da46.8513a58",
     "type": "save",
     "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4737.333312988281,
-    "y": 2364.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4880,
+    "y": 2263,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "63d5aebc.7e418",
+    "id": "3ac4cfaa.a33bf8",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
     "comments": "",
-    "x": 4595.333312988281,
-    "y": 2322.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4738,
+    "y": 2221,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "a53e3184.87caf8",
+    "id": "80579be4.10d908",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4666.333312988281,
-    "y": 2413.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4809,
+    "y": 2312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "27db8b21.23f75c",
+    "id": "59ca2fb3.db456",
     "type": "set",
     "name": "set attachment_param (gfp-n) for OTN",
     "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
     "comments": "",
-    "x": 3291.3333129882812,
-    "y": 680.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3434,
+    "y": 579,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c22368e1.6b1058",
+    "id": "e8c1824d.c7b678",
     "type": "comment",
     "name": "only dst ttp exists. No src",
     "info": "",
     "comments": "",
-    "x": 3886.3333129882812,
-    "y": 366.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4029,
+    "y": 265,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "87e2c89e.c92dc",
+    "id": "6594c17a.b17458",
     "type": "comment",
     "name": "only src ttp exists. No dst",
     "info": "",
     "comments": "",
-    "x": 3443.3333129882812,
-    "y": 1944.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3586,
+    "y": 1843,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "582aaedf.79cf78",
+    "id": "918c203c.df9608",
     "type": "switchNode",
     "name": "switch vpn-binding has src-access-ltp",
     "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3622.3333129882812,
-    "y": 528.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3765,
+    "y": 427,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "16dc47d9.553a58",
-        "e13eb694.152348"
+        "bfcf03d4.3ffba",
+        "71ba846a.64e1d4"
       ]
     ]
   },
   {
-    "id": "e13eb694.152348",
+    "id": "71ba846a.64e1d4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3864.3333129882812,
-    "y": 1117.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4007,
+    "y": 1016,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "7db46487.9eca7c"
+        "98c2d638.1715f8"
       ]
     ]
   },
   {
-    "id": "16dc47d9.553a58",
+    "id": "bfcf03d4.3ffba",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3858.3333129882812,
-    "y": 408.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4001,
+    "y": 307,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "7f468ae0.55d61c"
+        "a35804af.f7d858"
       ]
     ]
   },
   {
-    "id": "7db46487.9eca7c",
+    "id": "98c2d638.1715f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4022.3333129882812,
-    "y": 1116.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4165,
+    "y": 1015,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "27bc6cfd.f882bc",
-        "798042fa.f28ecc",
-        "44029581.1e0294",
-        "2e2e336b.2a2684",
-        "c0302985.1bc5d8",
-        "3bfb4fd1.bca51"
+        "d3cd38dd.2ebd58",
+        "ad06e711.5b1538",
+        "8a91f9fb.3806c",
+        "162c1530.673073",
+        "7140d593.b05bc4",
+        "baf6ec9f.d24be"
       ]
     ]
   },
   {
-    "id": "798042fa.f28ecc",
+    "id": "ad06e711.5b1538",
     "type": "set",
     "name": "set attachment_param for OTN G",
     "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
     "comments": "",
-    "x": 4286.333312988281,
-    "y": 999.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4429,
+    "y": 898,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c0302985.1bc5d8",
+    "id": "7140d593.b05bc4",
     "type": "execute",
     "name": "execute RestApiCallNode Create OTN tunnel with token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4367.333312988281,
-    "y": 1314.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4510,
+    "y": 1213,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "cb1eb04b.0a8a5",
-        "c9a4895f.79f59"
+        "3f3f2221.846d2e",
+        "8610f4b1.bab488"
       ]
     ]
   },
   {
-    "id": "cb1eb04b.0a8a5",
+    "id": "3f3f2221.846d2e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4676.833312988281,
-    "y": 1283.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4819.5,
+    "y": 1182,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5c0ad877.d4666"
+        "1759fa75.7439f6"
       ]
     ]
   },
   {
-    "id": "c9a4895f.79f59",
+    "id": "8610f4b1.bab488",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4681.833312988281,
-    "y": 1348.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4824.5,
+    "y": 1247,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "647a8c60.745274"
+        "ea3b42ee.d3dc2"
       ]
     ]
   },
   {
-    "id": "5c0ad877.d4666",
+    "id": "1759fa75.7439f6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
     "comments": "",
-    "x": 4852.833312988281,
-    "y": 1283.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4995.5,
+    "y": 1182,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "647a8c60.745274",
+    "id": "ea3b42ee.d3dc2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4848.333312988281,
-    "y": 1348.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4991,
+    "y": 1247,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "44029581.1e0294",
+    "id": "8a91f9fb.3806c",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
     "comments": "",
-    "x": 4224.333312988281,
-    "y": 1047.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4367,
+    "y": 946,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "2e2e336b.2a2684",
+    "id": "162c1530.673073",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 4250.333312988281,
-    "y": 1164.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4393,
+    "y": 1063,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "aa3dc68a.e420e",
-        "2fd5a39c.e4d124",
-        "be0fb969.9df28"
+        "8b8f3e33.0b8288",
+        "bbf641fc.079918",
+        "aed8a0af.bcb0e8"
       ]
     ]
   },
   {
-    "id": "aa3dc68a.e420e",
+    "id": "8b8f3e33.0b8288",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4445.833435058594,
-    "y": 1116.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4588.5001220703125,
+    "y": 1015,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bee191ec.52168"
+        "175bae6d.5d0f5a"
       ]
     ]
   },
   {
-    "id": "2fd5a39c.e4d124",
+    "id": "bbf641fc.079918",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4437.833435058594,
-    "y": 1171.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4580.5001220703125,
+    "y": 1070,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "53b0c593.b44354"
+        "fdde9a8e.52abd"
       ]
     ]
   },
   {
-    "id": "bee191ec.52168",
+    "id": "175bae6d.5d0f5a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4590.215759277344,
-    "y": 1115.6556777954102,
-    "z": "88b99be5.091bf8",
+    "x": 4732.8824462890625,
+    "y": 1014.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "41b89aec.8f3b84"
+        "719f0fb2.9b4ea"
       ]
     ]
   },
   {
-    "id": "41b89aec.8f3b84",
+    "id": "719f0fb2.9b4ea",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4774.333312988281,
-    "y": 1114.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4917,
+    "y": 1013,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "860e8326.494828"
+        "776708d.aaadf78"
       ]
     ]
   },
   {
-    "id": "860e8326.494828",
+    "id": "776708d.aaadf78",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4969.333312988281,
-    "y": 1114.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5112,
+    "y": 1013,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "95d294a2.519858"
+        "2f8639e1.f5b81e"
       ]
     ]
   },
   {
-    "id": "be0fb969.9df28",
+    "id": "aed8a0af.bcb0e8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4442.833435058594,
-    "y": 1228.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4585.5001220703125,
+    "y": 1127,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a6d3daf4.4de778"
+        "16ba7b0.a295705"
       ]
     ]
   },
   {
-    "id": "a6d3daf4.4de778",
+    "id": "16ba7b0.a295705",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4594.833435058594,
-    "y": 1229.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4737.5001220703125,
+    "y": 1128,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "53b0c593.b44354",
+    "id": "fdde9a8e.52abd",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4605.833435058594,
-    "y": 1172.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4748.5001220703125,
+    "y": 1071,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "27bc6cfd.f882bc",
+    "id": "d3cd38dd.2ebd58",
     "type": "set",
     "name": "set vpn-bindingG and connectivityG",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
     "comments": "",
-    "x": 4281.333312988281,
-    "y": 939.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4424,
+    "y": 838,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "95d294a2.519858",
+    "id": "2f8639e1.f5b81e",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5172.333312988281,
-    "y": 1118.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5315,
+    "y": 1017,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "280af449.de2e3c"
+        "4e6eba09.52f61c"
       ]
     ]
   },
   {
-    "id": "ef3f04cf.8bb518",
+    "id": "d0ebf00f.416c5",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5557.333312988281,
-    "y": 1131.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5700,
+    "y": 1030,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "31456949.0bd6c6",
-        "ae6ce682.b30c68",
-        "e0e5a782.5ecb88"
+        "504e55c8.8a8984",
+        "eddcd7ad.fdc98",
+        "17833a87.15b8f5"
       ]
     ]
   },
   {
-    "id": "280af449.de2e3c",
+    "id": "4e6eba09.52f61c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5351.333312988281,
-    "y": 1118.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5494,
+    "y": 1017,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "7f6c4201.ca3284",
-        "ef3f04cf.8bb518"
+        "951ffcc3.fc60c8",
+        "d0ebf00f.416c5"
       ]
     ]
   },
   {
-    "id": "7f6c4201.ca3284",
+    "id": "951ffcc3.fc60c8",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainG id",
     "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5587.333312988281,
-    "y": 1079.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5730,
+    "y": 978,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "31456949.0bd6c6",
+    "id": "504e55c8.8a8984",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5767.333312988281,
-    "y": 1122.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5910,
+    "y": 1021,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "37e04a2.a327336"
+        "8e64943.8a64ae8"
       ]
     ]
   },
   {
-    "id": "ae6ce682.b30c68",
+    "id": "eddcd7ad.fdc98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5759.333312988281,
-    "y": 1177.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5902,
+    "y": 1076,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "536ede72.dab3b"
+        "6bb74cc0.02d7dc"
       ]
     ]
   },
   {
-    "id": "e0e5a782.5ecb88",
+    "id": "17833a87.15b8f5",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5764.333312988281,
-    "y": 1234.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5907,
+    "y": 1133,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "f46537ce.c9aaa8"
+        "43c2b842.215f48"
       ]
     ]
   },
   {
-    "id": "f46537ce.c9aaa8",
+    "id": "43c2b842.215f48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5916.333312988281,
-    "y": 1235.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 6059,
+    "y": 1134,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "536ede72.dab3b",
+    "id": "6bb74cc0.02d7dc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5927.333312988281,
-    "y": 1180.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 6070,
+    "y": 1079,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "37e04a2.a327336",
+    "id": "8e64943.8a64ae8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5911.715637207031,
-    "y": 1119.6556777954102,
-    "z": "88b99be5.091bf8",
+    "x": 6054.38232421875,
+    "y": 1018.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "77189bba.da3f4c"
+        "fb3f7d81.a9fad8"
       ]
     ]
   },
   {
-    "id": "77189bba.da3f4c",
+    "id": "fb3f7d81.a9fad8",
     "type": "set",
     "name": "set controller domainG data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 6126.333312988281,
-    "y": 1116.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 6269,
+    "y": 1015,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "217a8eaf.b5afda",
+    "id": "534dacd3.c0ac9c",
     "type": "comment",
     "name": "both src and dst exist",
     "info": "",
     "comments": "",
-    "x": 3900.3333129882812,
-    "y": 1057.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4043,
+    "y": 956,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "877d8b16.d3994",
+    "id": "1812ba90.3bec25",
     "type": "switchNode",
     "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
     "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2462.3333129882812,
-    "y": 784.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2605,
+    "y": 683,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "df6e125e.14274",
-        "fd236e9d.746de"
+        "1c061163.c474df",
+        "695afc2e.f3ca34"
       ]
     ]
   },
   {
-    "id": "fd236e9d.746de",
+    "id": "695afc2e.f3ca34",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2869.3333129882812,
-    "y": 802.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3012,
+    "y": 701,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a1b579c2.6ca69"
+        "fdf83271.37011"
       ]
     ]
   },
   {
-    "id": "df6e125e.14274",
+    "id": "1c061163.c474df",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2869.3333129882812,
-    "y": 747.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3012,
+    "y": 646,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "51a6a8ff.40f098"
+        "ca8832e9.e2e2f8"
       ]
     ]
   },
   {
-    "id": "51a6a8ff.40f098",
+    "id": "ca8832e9.e2e2f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3025.3333129882812,
-    "y": 745.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3168,
+    "y": 644,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "27db8b21.23f75c",
-        "afc78578.3291"
+        "59ca2fb3.db456",
+        "4f2225d8.9c49ec"
       ]
     ]
   },
   {
-    "id": "a1b579c2.6ca69",
+    "id": "fdf83271.37011",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3002.3333129882812,
-    "y": 803.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3145,
+    "y": 702,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "cef7b9ce.1b3ba8",
+    "id": "c82b1b5b.8e5c4",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
     "comments": "",
-    "x": 1179.3333129882812,
-    "y": 219.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1322,
+    "y": 118,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "bdafe4d.0bce798",
+    "id": "411de79.b4b0f18",
     "type": "comment",
     "name": "CLL new",
     "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
     "comments": "",
-    "x": 4296.333312988281,
-    "y": 637.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4439,
+    "y": 536,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "20794036.3e0d98",
+    "id": "8951fa6a.a6da3",
     "type": "set",
     "name": "set leaf-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",
     "comments": "",
-    "x": 4356.333312988281,
-    "y": 676.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4499,
+    "y": 575,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "306cc859.5059d",
+    "id": "476ddcd6.ba7404",
     "type": "set",
     "name": "unset leaf-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",
     "comments": "",
-    "x": 1172.3333129882812,
-    "y": 127.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1315,
+    "y": 26,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "3258d8ff.e890f",
+    "id": "1bf6340f.f5f2ec",
     "type": "comment",
     "name": "CLL new",
     "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
     "comments": "",
-    "x": 3708.3333129882812,
-    "y": 2153.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3851,
+    "y": 2052,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "33be6bd8.7ec864",
+    "id": "7bb669b7.d54818",
     "type": "set",
     "name": "set root-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",
     "comments": "",
-    "x": 3764.3333129882812,
-    "y": 2202.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3907,
+    "y": 2101,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7f9af85d.c9b1a",
+    "id": "6657df85.d2b128",
     "type": "set",
     "name": "unset root-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",
     "comments": "",
-    "x": 1172.3333129882812,
-    "y": 166.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1315,
+    "y": 65,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "5f84eccb.714dcc",
+    "id": "cf6ce2f3.f820a",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1203.3333129882812,
-    "y": 267.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1346,
+    "y": 166,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "3014f91f.87a3fe",
+    "id": "a8ba69c5.3110b8",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
     "comments": "",
     "outputs": 1,
-    "x": 413.33331298828125,
-    "y": 742.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 556,
+    "y": 641,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "ad3a20d5.f6589",
-        "e51813a.1cc197",
-        "ca637d1.24786"
+        "502e9c54.45eb3c",
+        "889f52ba.eeef7",
+        "28d7625.1c6aa1e"
       ]
     ]
   },
   {
-    "id": "ad3a20d5.f6589",
+    "id": "502e9c54.45eb3c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 632.3333129882812,
-    "y": 680.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 775,
+    "y": 579,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5ade52fc.bbf09c"
+        "1f16072d.60be49"
       ]
     ]
   },
   {
-    "id": "e51813a.1cc197",
+    "id": "889f52ba.eeef7",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 641.8242797851562,
-    "y": 722.5740432739258,
-    "z": "88b99be5.091bf8",
+    "x": 784.490966796875,
+    "y": 621.5740356445312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "ca637d1.24786",
+    "id": "28d7625.1c6aa1e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 630.3333129882812,
-    "y": 769.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 773,
+    "y": 668,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "67b4863e.f31f1"
+        "ccd7626e.e5286"
       ]
     ]
   },
   {
-    "id": "5ade52fc.bbf09c",
+    "id": "1f16072d.60be49",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 829.3333129882812,
-    "y": 676.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 972,
+    "y": 575,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "805608ab.1113d"
+        "839ea221.6a3238"
       ]
     ]
   },
   {
-    "id": "67b4863e.f31f1",
+    "id": "ccd7626e.e5286",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 799.3333129882812,
-    "y": 770.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 942,
+    "y": 669,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "805608ab.1113d",
+    "id": "839ea221.6a3238",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1052.6668090820312,
-    "y": 675.9999465942383,
-    "z": "88b99be5.091bf8",
+    "x": 1195.33349609375,
+    "y": 574.9999389648438,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "fce88b79.ad9ea"
+        "8ba544cb.07a21"
       ]
     ]
   },
   {
-    "id": "fce88b79.ad9ea",
+    "id": "8ba544cb.07a21",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1253.3334465026855,
-    "y": 677.0000286102295,
-    "z": "88b99be5.091bf8",
+    "x": 1396.0001335144043,
+    "y": 576.000020980835,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "324a4f4a.beb9"
+        "f797d924.6d542"
       ]
     ]
   },
   {
-    "id": "324a4f4a.beb9",
+    "id": "f797d924.6d542",
     "type": "save",
     "name": "get connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 383.33331298828125,
-    "y": 939.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 526,
+    "y": 838,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5a7cd799.dd504",
-        "c46ba437.0993",
-        "3526445b.eeea9c"
+        "55f1b492.85099c",
+        "efb1ebef.255b68",
+        "f3e73178.97a2a"
       ]
     ]
   },
   {
-    "id": "5a7cd799.dd504",
+    "id": "55f1b492.85099c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 591.3333129882812,
-    "y": 903.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 734,
+    "y": 802,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "63b8bbd2.15c994"
+        "b45da909.27452"
       ]
     ]
   },
   {
-    "id": "c46ba437.0993",
+    "id": "efb1ebef.255b68",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 591.8242797851562,
-    "y": 948.5740432739258,
-    "z": "88b99be5.091bf8",
+    "x": 734.490966796875,
+    "y": 847.5740356445312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "3526445b.eeea9c",
+    "id": "f3e73178.97a2a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 589.3333129882812,
-    "y": 992.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 732,
+    "y": 891,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "c4b232cc.80b998"
+        "e06cb3b.90f78d"
       ]
     ]
   },
   {
-    "id": "c4b232cc.80b998",
+    "id": "e06cb3b.90f78d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 758.3333129882812,
-    "y": 993.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 901,
+    "y": 892,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "bd0ad7c2.1f4f3",
+    "id": "58a3e896.b9ca7",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 730.3333129882812,
-    "y": 1487.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 873,
+    "y": 1386,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "fb10f5a.4414808"
+        "ed8e0c4d.c624f8"
       ]
     ]
   },
   {
-    "id": "fb10f5a.4414808",
+    "id": "ed8e0c4d.c624f8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 933.3333129882812,
-    "y": 1499.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1076,
+    "y": 1398,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "31b4d2c5.66c72e"
+        "31bb3da4.3ce832"
       ]
     ]
   },
   {
-    "id": "31b4d2c5.66c72e",
+    "id": "31bb3da4.3ce832",
     "type": "outcome",
     "name": "UNI",
     "xml": "<outcome value='uni'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1099.3333129882812,
-    "y": 1496.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1242,
+    "y": 1395,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d62a4bb8.975ae8"
+        "7ad884e0.ebf21c"
       ]
     ]
   },
   {
-    "id": "d62a4bb8.975ae8",
+    "id": "7ad884e0.ebf21c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1260.3333129882812,
-    "y": 1493.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1403,
+    "y": 1392,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "46f537c9.1c8be8",
-        "f8fe77e2.d43ff8",
-        "6a183fad.35ec3",
-        "f7155528.92cd7",
-        "65c7779e.8d1a88",
-        "cccd2695.c600b"
+        "319b90ba.5fa548",
+        "5d60f478.58b2dc",
+        "478f42b4.faa2d4",
+        "573af6c.7f50588",
+        "1b5d7c99.3bb563",
+        "a7cc4e14.f32b08"
       ]
     ]
   },
   {
-    "id": "f8fe77e2.d43ff8",
+    "id": "5d60f478.58b2dc",
     "type": "set",
     "name": "unset tmp.aai.uni",
     "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
     "comments": "",
-    "x": 1466.3333129882812,
-    "y": 1092.9999465942383,
-    "z": "88b99be5.091bf8",
+    "x": 1609,
+    "y": 991.9999389648438,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "46f537c9.1c8be8",
+    "id": "319b90ba.5fa548",
     "type": "save",
     "name": "get uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1463.3333129882812,
-    "y": 1137.9999465942383,
-    "z": "88b99be5.091bf8",
+    "x": 1606,
+    "y": 1036.9999389648438,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4e769c0f.1938ec",
-        "3dc6fc35.d186bc",
-        "90b11589.d4f84"
+        "be8d977b.6062b8",
+        "2f61d10e.8f5e3e",
+        "9e1188e1.cf8b3"
       ]
     ]
   },
   {
-    "id": "3dc6fc35.d186bc",
+    "id": "2f61d10e.8f5e3e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1658.8242797851562,
-    "y": 1111.5739212036133,
-    "z": "88b99be5.091bf8",
+    "x": 1801.490966796875,
+    "y": 1010.5739135742188,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6d117931.940098"
+        "771eefb0.aeb88"
       ]
     ]
   },
   {
-    "id": "90b11589.d4f84",
+    "id": "9e1188e1.cf8b3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1654.3333129882812,
-    "y": 1155.999885559082,
-    "z": "88b99be5.091bf8",
+    "x": 1797,
+    "y": 1054.9998779296875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "f48b55b8.ea1ca8"
+        "47c4b052.107038"
       ]
     ]
   },
   {
-    "id": "6d117931.940098",
+    "id": "771eefb0.aeb88",
     "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": 1821.3958129882812,
-    "y": 1110.8596267700195,
-    "z": "88b99be5.091bf8",
+    "x": 1964.0625,
+    "y": 1009.859619140625,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "f48b55b8.ea1ca8",
+    "id": "47c4b052.107038",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1822.3333129882812,
-    "y": 1155.999885559082,
-    "z": "88b99be5.091bf8",
+    "x": 1965,
+    "y": 1054.9998779296875,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e35ee523.d065b8",
+    "id": "2be34ba3.ed43bc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1824.3333129882812,
-    "y": 1202.999885559082,
-    "z": "88b99be5.091bf8",
+    "x": 1967,
+    "y": 1101.9998779296875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "4e769c0f.1938ec",
+    "id": "be8d977b.6062b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1655.3333129882812,
-    "y": 1202.999885559082,
-    "z": "88b99be5.091bf8",
+    "x": 1798,
+    "y": 1101.9998779296875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e35ee523.d065b8"
+        "2be34ba3.ed43bc"
       ]
     ]
   },
   {
-    "id": "bf815f65.ee4c28",
+    "id": "41b34545.fd0234",
     "type": "comment",
     "name": "CLL new",
     "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
     "comments": "",
-    "x": 1437.3333129882812,
-    "y": 1724.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1580,
+    "y": 1623,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "6a183fad.35ec3",
+    "id": "478f42b4.faa2d4",
     "type": "set",
     "name": "set ethernet-srv-end-points-list array",
-    "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
+    "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<!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
     "comments": "",
-    "x": 1528.3333129882812,
-    "y": 1778.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1671,
+    "y": 1677,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "1ef1fe95.45b2b9",
+    "id": "651de255.0b2e64",
     "type": "set",
     "name": "unset ethernet-srv-end-points-list",
     "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
     "comments": "",
-    "x": 2204.8333129882812,
-    "y": 1191.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2347.5,
+    "y": 1090,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "dbeb188c.810cc",
+    "id": "d6d9ebdf.e9fb3",
     "type": "set",
     "name": "unset ethernet-srv-end-points-list",
     "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
     "comments": "",
-    "x": 2209.8333129882812,
-    "y": 1293.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2352.5,
+    "y": 1192,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "f8c77435.00d858",
+    "id": "19b7b815.a2da88",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 693.3333129882812,
-    "y": 1743.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 836,
+    "y": 1642,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e5d4675a.166ce"
+        "326b550a.9db58a"
       ]
     ]
   },
   {
-    "id": "e5d4675a.166ce",
+    "id": "326b550a.9db58a",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 925.3333129882812,
-    "y": 1742.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1068,
+    "y": 1641,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a4b4e62.0b9bb18"
+        "ee715cec.70103"
       ]
     ]
   },
   {
-    "id": "a4b4e62.0b9bb18",
+    "id": "ee715cec.70103",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1137.3333129882812,
-    "y": 1743.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1280,
+    "y": 1642,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "79b56211.8303fc"
+        "43195eb9.e8bde"
       ]
     ]
   },
   {
-    "id": "79b56211.8303fc",
+    "id": "43195eb9.e8bde",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 393.33331298828125,
-    "y": 1899.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 536,
+    "y": 1798,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5e413ae2.fc139c",
-        "a0eb6cf6.129b98"
+        "1e409cd.23bb4e3",
+        "e0ab136c.d8395"
       ]
     ]
   },
   {
-    "id": "a0eb6cf6.129b98",
+    "id": "e0ab136c.d8395",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 628.3333129882812,
-    "y": 1886.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 771,
+    "y": 1785,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "5e413ae2.fc139c",
+    "id": "1e409cd.23bb4e3",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 618.3333129882812,
-    "y": 1947.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 761,
+    "y": 1846,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5d519b04.edc364",
-        "44e78fc4.a8de9",
-        "77b9ca42.e1131c"
+        "1385ba51.9ab07e",
+        "5c95ef7e.18572",
+        "b238e66d.1cae98"
       ]
     ]
   },
   {
-    "id": "44e78fc4.a8de9",
+    "id": "5c95ef7e.18572",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 831.8242797851562,
-    "y": 1931.5740432739258,
-    "z": "88b99be5.091bf8",
+    "x": 974.490966796875,
+    "y": 1830.5740356445312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "93fe98b.5489068"
+        "a28f4f7.3d20fb"
       ]
     ]
   },
   {
-    "id": "77b9ca42.e1131c",
+    "id": "b238e66d.1cae98",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 827.3333129882812,
-    "y": 1976.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 970,
+    "y": 1875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "376a9d2f.bd1f52"
+        "20e3dbdd.0ffc3c"
       ]
     ]
   },
   {
-    "id": "5d519b04.edc364",
+    "id": "1385ba51.9ab07e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 829.3333129882812,
-    "y": 2036.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 972,
+    "y": 1935,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "fa4146f3.54f198"
+        "dcbbe04b.ec00a"
       ]
     ]
   },
   {
-    "id": "93fe98b.5489068",
+    "id": "a28f4f7.3d20fb",
     "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": 994.3958129882812,
-    "y": 1930.859748840332,
-    "z": "88b99be5.091bf8",
+    "x": 1137.0625,
+    "y": 1829.8597412109375,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "376a9d2f.bd1f52",
+    "id": "20e3dbdd.0ffc3c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 995.3333129882812,
-    "y": 1976.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1138,
+    "y": 1875,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "fa4146f3.54f198",
+    "id": "dcbbe04b.ec00a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 998.3333129882812,
-    "y": 2035.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1141,
+    "y": 1934,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "ef75e4e3.1f8138",
-        "e2966b29.fc5b38"
+        "5f788739.44bc78",
+        "7a2f8c3.df4e4f4"
       ]
     ]
   },
   {
-    "id": "572a8f36.0443a",
+    "id": "968f8b65.0f9e28",
     "type": "set",
     "name": "set sotn_value",
-    "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
+    "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
     "comments": "",
-    "x": 397.33331298828125,
-    "y": 2534.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 540,
+    "y": 2433,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "944da194.59bcd",
+    "id": "d784554f.a0db1",
     "type": "execute",
     "name": "execute RestApiCallNode Create ethernet Service without token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop-protection.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 540.3333129882812,
-    "y": 2594.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 683,
+    "y": 2493,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d840ad4b.1282a",
-        "89a7b87.1e553c8"
+        "d0e8b7bc.b13c",
+        "92d47971.6e56"
       ]
     ]
   },
   {
-    "id": "d840ad4b.1282a",
+    "id": "d0e8b7bc.b13c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 852.8333129882812,
-    "y": 2571.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 995.5,
+    "y": 2470,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "89a7b87.1e553c8",
+    "id": "92d47971.6e56",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 856.8333129882812,
-    "y": 2611.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 999.5,
+    "y": 2510,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5d5378bf.137d"
+        "d5b32099.fe43f"
       ]
     ]
   },
   {
-    "id": "9a01795a.7ab4e",
+    "id": "1ff5a710.b4bb29",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
     "comments": "",
-    "x": 1032.8333129882812,
-    "y": 2575.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1175.5,
+    "y": 2474,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "5d5378bf.137d",
+    "id": "d5b32099.fe43f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1048.3333129882812,
-    "y": 2629.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1191,
+    "y": 2528,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6dbe844a.8a9554",
-        "63370d02.a0670c",
-        "1ca90fe2.261db8",
-        "2ecfa879.64974"
+        "ca571afb.4a46e8",
+        "1210758a.a607e2",
+        "9f2557cf.e0f36",
+        "c6235f90.04d29"
       ]
     ]
   },
   {
-    "id": "ef77bece.8a7928",
+    "id": "7f59e1a7.53806",
     "type": "save",
     "name": "update vpn-binding resource (aka. OTN ) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1343.8333129882812,
-    "y": 2598.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1486.5,
+    "y": 2497,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "33e96132.6ee886",
+    "id": "5a3937e0.a5f138",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
     "comments": "",
-    "x": 2810.8333129882812,
-    "y": 1949.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2953.5,
+    "y": 1848,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "6dbe844a.8a9554",
+    "id": "ca571afb.4a46e8",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1305.8333129882812,
-    "y": 2640.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1448.5,
+    "y": 2539,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "c08ad06c.488d4",
+    "id": "5eba1f1e.c5c1c",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
     "comments": "",
-    "x": 2170.8333129882812,
-    "y": 1229.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2313.5,
+    "y": 1128,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "2ee2b867.995c6",
+    "id": "14e15bd9.f573a4",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
     "comments": "",
-    "x": 2171.8333129882812,
-    "y": 1333.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2314.5,
+    "y": 1232,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "5a5b3fd3.939fa",
+    "id": "46bfac70.a8d9fc",
     "type": "save",
     "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4465.333312988281,
-    "y": 590.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4608,
+    "y": 489,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "3bfb4fd1.bca51",
+    "id": "baf6ec9f.d24be",
     "type": "save",
     "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4368.333312988281,
-    "y": 1409.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4511,
+    "y": 1308,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "7832f278.b4880c",
+    "id": "bfef7878.c9996",
     "type": "save",
     "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3862.3333129882812,
-    "y": 2081.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4005,
+    "y": 1980,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "63b8bbd2.15c994",
+    "id": "b45da909.27452",
     "type": "switchNode",
     "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",
     "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 963.3333129882812,
-    "y": 889.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1106,
+    "y": 788,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a66053fc.e972e8",
-        "286bc10d.0b75fe"
+        "b0133784.5a4a",
+        "99418662.5bc768"
       ]
     ]
   },
   {
-    "id": "a66053fc.e972e8",
+    "id": "b0133784.5a4a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1326.3333129882812,
-    "y": 912.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1469,
+    "y": 811,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6f304f3b.74dcb"
+        "288f63da.bd0d24"
       ]
     ]
   },
   {
-    "id": "286bc10d.0b75fe",
+    "id": "99418662.5bc768",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1326.3333129882812,
-    "y": 861.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1469,
+    "y": 760,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bf68aa32.2da6d"
+        "e20160a5.497008"
       ]
     ]
   },
   {
-    "id": "6f304f3b.74dcb",
+    "id": "288f63da.bd0d24",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1482.3333129882812,
-    "y": 910.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1625,
+    "y": 809,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9b8bc380.4fea78"
+        "45fa8d37.dd8774"
       ]
     ]
   },
   {
-    "id": "bf68aa32.2da6d",
+    "id": "e20160a5.497008",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1459.3333129882812,
-    "y": 862.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1602,
+    "y": 761,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "b3333886.2341",
+    "id": "cefb7e41.dee868",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 2219.3333129882812,
-    "y": 260.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 2362,
+    "y": 159,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "cc8c0809.c4ad6",
+    "id": "fc2523d9.c5b768",
     "type": "set",
     "name": "set root-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
     "comments": "",
-    "x": 3761.3333129882812,
-    "y": 2241.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3904,
+    "y": 2140,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "eb39e6d9.695df8",
+    "id": "d22b47c.48051b8",
     "type": "set",
     "name": "set leaf-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
     "comments": "",
-    "x": 4351.333312988281,
-    "y": 714.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4494,
+    "y": 613,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "f7155528.92cd7",
+    "id": "573af6c.7f50588",
     "type": "set",
     "name": "set ethernet-srv-end-points-list array",
     "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
     "comments": "",
-    "x": 1525.3333129882812,
-    "y": 1820.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1668,
+    "y": 1719,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7ad9431e.95fd94",
+    "id": "b8cd961f.31b1e",
     "type": "set",
     "name": "set filename",
     "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
     "comments": "",
-    "x": 704.3333129882812,
-    "y": 1554.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 847,
+    "y": 1453,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "da906021.6570a8",
+    "id": "e61f86e7.4b844",
     "type": "execute",
     "name": "execute printContext",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 735.3333129882812,
-    "y": 1594.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 878,
+    "y": 1493,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "ef75e4e3.1f8138",
+    "id": "5f788739.44bc78",
     "type": "set",
     "name": "set otn-tunnels-name-list array",
     "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",
     "comments": "",
-    "x": 1283.3333129882812,
-    "y": 2002.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1426,
+    "y": 1901,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e2966b29.fc5b38",
+    "id": "7a2f8c3.df4e4f4",
     "type": "set",
     "name": "set otn-tunnels-name-list array",
     "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
     "comments": "",
-    "x": 1286.3333129882812,
-    "y": 2044.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1429,
+    "y": 1943,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "64010c53.9fe67c",
+    "id": "faabf01d.19b578",
     "type": "set",
     "name": "unset otn-tunnels-name-list array",
     "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",
     "comments": "",
-    "x": 729.3333129882812,
-    "y": 1684.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 872,
+    "y": 1583,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d5a25879.5481b8",
+    "id": "9608fe0d.afb518",
     "type": "set",
     "name": "set filename",
     "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
     "comments": "",
-    "x": 484.33331298828125,
-    "y": 2063.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 627,
+    "y": 1962,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7aac81ec.ba7cc8",
+    "id": "a9b8ee61.6ebf68",
     "type": "execute",
     "name": "execute printContext",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 492.33331298828125,
-    "y": 2120.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 635,
+    "y": 2019,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "65c7779e.8d1a88",
+    "id": "1b5d7c99.3bb563",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1503.3333129882812,
-    "y": 1669.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1646,
+    "y": 1568,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2c5e4010.43e508",
-        "e3644437.55d698"
+        "7979c8cd.b373d",
+        "23095b34.b6c794"
       ]
     ]
   },
   {
-    "id": "e3644437.55d698",
+    "id": "23095b34.b6c794",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1726.3333129882812,
-    "y": 1624.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1869,
+    "y": 1523,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "63f336a7.fff6b"
+        "b9f88a30.b1b1"
       ]
     ]
   },
   {
-    "id": "2c5e4010.43e508",
+    "id": "7979c8cd.b373d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1728.3333129882812,
-    "y": 1688.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1871,
+    "y": 1587,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2fd3ce09.17bf12"
+        "4c2d0979.5cdfa"
       ]
     ]
   },
   {
-    "id": "63f336a7.fff6b",
+    "id": "b9f88a30.b1b1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1891.3333129882812,
-    "y": 1621.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2034,
+    "y": 1520,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "185277bc.64228"
+        "a93541e2.34e668"
       ]
     ]
   },
   {
-    "id": "2fd3ce09.17bf12",
+    "id": "4c2d0979.5cdfa",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 1890.3333129882812,
-    "y": 1684.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2033,
+    "y": 1583,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "185277bc.64228",
+    "id": "a93541e2.34e668",
     "type": "set",
     "name": "set tmp.uni-node-id-short",
     "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",
     "comments": "",
-    "x": 2111.3333129882812,
-    "y": 1635.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2254,
+    "y": 1534,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "f4fd995d.61939",
+    "id": "2126128b.9ba956",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1656.3333129882812,
-    "y": 2360.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1799,
+    "y": 2259,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "3bd70d03.1cae1a"
+        "62735f15.7b8b4"
       ]
     ]
   },
   {
-    "id": "fea4d7d8.17bf48",
+    "id": "47d236a4.c5327",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 2041.3333129882812,
-    "y": 2373.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2184,
+    "y": 2272,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "753e6379.2f2664",
-        "3a690bb3.5501f4",
-        "105362f3.9957cd"
+        "fd91a13a.7b2ed",
+        "dc7a52c4.792ff8",
+        "81cf7ce4.5be808"
       ]
     ]
   },
   {
-    "id": "3bd70d03.1cae1a",
+    "id": "62735f15.7b8b4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1835.3333129882812,
-    "y": 2360.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1978,
+    "y": 2259,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "3086e43a.76dc2c",
-        "fea4d7d8.17bf48"
+        "fb54c20.839104",
+        "47d236a4.c5327"
       ]
     ]
   },
   {
-    "id": "3086e43a.76dc2c",
+    "id": "fb54c20.839104",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainConn id",
     "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 2071.3333129882812,
-    "y": 2321.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2214,
+    "y": 2220,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "753e6379.2f2664",
+    "id": "fd91a13a.7b2ed",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2251.3333129882812,
-    "y": 2364.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2394,
+    "y": 2263,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "57e3082b.ec85c"
+        "66b9462d.a94c6"
       ]
     ]
   },
   {
-    "id": "3a690bb3.5501f4",
+    "id": "dc7a52c4.792ff8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2243.3333129882812,
-    "y": 2419.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2386,
+    "y": 2318,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e1967348.adb6a"
+        "4ff23f6c.d7f718"
       ]
     ]
   },
   {
-    "id": "105362f3.9957cd",
+    "id": "81cf7ce4.5be808",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2248.3333129882812,
-    "y": 2476.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2391,
+    "y": 2375,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9b464363.d7abc"
+        "45252a0c.1579ec"
       ]
     ]
   },
   {
-    "id": "9b464363.d7abc",
+    "id": "45252a0c.1579ec",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 2400.3333129882812,
-    "y": 2477.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2543,
+    "y": 2376,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e1967348.adb6a",
+    "id": "4ff23f6c.d7f718",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 2411.3333129882812,
-    "y": 2422.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2554,
+    "y": 2321,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "57e3082b.ec85c",
+    "id": "66b9462d.a94c6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2395.7156372070312,
-    "y": 2361.65567779541,
-    "z": "88b99be5.091bf8",
+    "x": 2538.38232421875,
+    "y": 2260.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a2d4cc4c.5835f"
+        "d426c7f3.a4f758"
       ]
     ]
   },
   {
-    "id": "a2d4cc4c.5835f",
+    "id": "d426c7f3.a4f758",
     "type": "set",
     "name": "set controller domainConn data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 2610.3333129882812,
-    "y": 2358.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2753,
+    "y": 2257,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "77651854.67a228",
+    "id": "9097bb51.35f598",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 734.3333129882812,
-    "y": 2406.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 877,
+    "y": 2305,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "8b371429.94e21",
-        "ddb97aef.ff9618",
-        "6bdf8533.ac0744"
+        "c5c9c64c.e5b6a",
+        "fbc95d65.751dd8",
+        "a12f5414.7f7f38"
       ]
     ]
   },
   {
-    "id": "8b371429.94e21",
+    "id": "c5c9c64c.e5b6a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 929.8334350585938,
-    "y": 2358.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1072.5001220703125,
+    "y": 2257,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "86408567.50b5f8"
+        "cd1789e.857e878"
       ]
     ]
   },
   {
-    "id": "ddb97aef.ff9618",
+    "id": "fbc95d65.751dd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 921.8334350585938,
-    "y": 2413.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1064.5001220703125,
+    "y": 2312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "83d0fe92.92a8c"
+        "641a2f60.3e56f"
       ]
     ]
   },
   {
-    "id": "86408567.50b5f8",
+    "id": "cd1789e.857e878",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1074.2157592773438,
-    "y": 2357.65567779541,
-    "z": "88b99be5.091bf8",
+    "x": 1216.8824462890625,
+    "y": 2256.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "206c1f26.03baa8"
+        "40024900.22ab5"
       ]
     ]
   },
   {
-    "id": "206c1f26.03baa8",
+    "id": "40024900.22ab5",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1258.3333129882812,
-    "y": 2356.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1401,
+    "y": 2255,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "604358eb.cf3bc"
+        "61575a21.5f4624"
       ]
     ]
   },
   {
-    "id": "604358eb.cf3bc",
+    "id": "61575a21.5f4624",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1453.3333129882812,
-    "y": 2356.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1596,
+    "y": 2255,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "f4fd995d.61939"
+        "2126128b.9ba956"
       ]
     ]
   },
   {
-    "id": "6bdf8533.ac0744",
+    "id": "a12f5414.7f7f38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 926.8334350585938,
-    "y": 2470.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1069.5001220703125,
+    "y": 2369,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "843f6d1c.7ee9c"
+        "73357d18.309cec"
       ]
     ]
   },
   {
-    "id": "843f6d1c.7ee9c",
+    "id": "73357d18.309cec",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 1078.8334350585938,
-    "y": 2471.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1221.5001220703125,
+    "y": 2370,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "83d0fe92.92a8c",
+    "id": "641a2f60.3e56f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 1089.8334350585938,
-    "y": 2414.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1232.5001220703125,
+    "y": 2313,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7e37f686.4b31c8",
+    "id": "1f9570cc.1dec3f",
     "type": "set",
     "name": "set tmp.pnf-name-forUrl",
     "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
     "comments": "",
-    "x": 724.3333129882812,
-    "y": 2318.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 867,
+    "y": 2217,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c0f06a3d.8ad7f8",
+    "id": "8c27b84f.305088",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 469.33331298828125,
-    "y": 2449.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 612,
+    "y": 2348,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "7e37f686.4b31c8",
-        "77651854.67a228"
+        "1f9570cc.1dec3f",
+        "9097bb51.35f598"
       ]
     ]
   },
   {
-    "id": "7e8f5942.82fe9",
+    "id": "518c62b.9bc109c",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 1684.2999877929688,
-    "y": 266.88333892822266,
-    "z": "88b99be5.091bf8",
+    "x": 1826.9666748046875,
+    "y": 165.88333129882812,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "9f7438aa.cfa3f8",
+    "id": "630bfd04.7da00c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 886.3333129882812,
-    "y": 489.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1029,
+    "y": 388,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "4162fe05.2b911",
+    "id": "87edee65.85ae28",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 445.83331298828125,
-    "y": 1458.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 588.5,
+    "y": 1357,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bd0ad7c2.1f4f3",
-        "f8c77435.00d858",
-        "7ad9431e.95fd94",
-        "da906021.6570a8",
-        "572a8f36.0443a",
-        "944da194.59bcd",
-        "64010c53.9fe67c",
-        "d5a25879.5481b8",
-        "7aac81ec.ba7cc8",
-        "c0f06a3d.8ad7f8",
-        "ad8e54c3.d3fe18"
+        "58a3e896.b9ca7",
+        "19b7b815.a2da88",
+        "b8cd961f.31b1e",
+        "e61f86e7.4b844",
+        "968f8b65.0f9e28",
+        "d784554f.a0db1",
+        "faabf01d.19b578",
+        "9608fe0d.afb518",
+        "a9b8ee61.6ebf68",
+        "8c27b84f.305088",
+        "d6d125c6.7c1ef"
       ]
     ]
   },
   {
-    "id": "cccd2695.c600b",
+    "id": "a7cc4e14.f32b08",
     "type": "switchNode",
     "name": "switch uni type",
     "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1476.3333129882812,
-    "y": 1296.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1619,
+    "y": 1195,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "8f7bce65.961b18",
-        "17cc18e5.7d037f",
-        "302ecb9b.5a47dc",
-        "c6b9b74d.1c7d78"
+        "b16fe4e0.6f4fa8",
+        "2186f280.8edb0e",
+        "ddeb0896.cc0458",
+        "c02b45cf.aa9298"
       ]
     ]
   },
   {
-    "id": "8f7bce65.961b18",
+    "id": "b16fe4e0.6f4fa8",
     "type": "outcome",
     "name": "leaf",
     "xml": "<outcome value='leaf'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1641.3333129882812,
-    "y": 1278.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1784,
+    "y": 1177,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "3943aa6e.c88a36"
+        "58f42d60.f5c1ac"
       ]
     ]
   },
   {
-    "id": "17cc18e5.7d037f",
+    "id": "2186f280.8edb0e",
     "type": "outcome",
     "name": "root",
     "xml": "<outcome value='root'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1644.3333129882812,
-    "y": 1317.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1787,
+    "y": 1216,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "47637f28.c69c6"
+        "2233c963.7160de"
       ]
     ]
   },
   {
-    "id": "c6b9b74d.1c7d78",
+    "id": "c02b45cf.aa9298",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1638.3333129882812,
-    "y": 1395.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1781,
+    "y": 1294,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "656a466a.445c98"
+        "7ed44e10.cd8f4"
       ]
     ]
   },
   {
-    "id": "302ecb9b.5a47dc",
+    "id": "ddeb0896.cc0458",
     "type": "outcome",
     "name": "secondary-root",
     "xml": "<outcome value='secondary-root'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1661.3333129882812,
-    "y": 1358.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1804,
+    "y": 1257,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6a61eaa3.28143c"
+        "17bdedbb.6d9ba2"
       ]
     ]
   },
   {
-    "id": "a2fb1650.227e28",
+    "id": "35f2d4d7.ba6b9c",
     "type": "set",
     "name": "unset ethernet-srv-end-points-list",
     "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
     "comments": "",
-    "x": 2207.3333129882812,
-    "y": 1391.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2350,
+    "y": 1290,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e35c4fb2.169e68",
+    "id": "1bdb940e.a70dfc",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-backup' />\n",
     "comments": "",
-    "x": 2169.3333129882812,
-    "y": 1431.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2312,
+    "y": 1330,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "656a466a.445c98",
+    "id": "7ed44e10.cd8f4",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1806.3333129882812,
-    "y": 1395.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1949,
+    "y": 1294,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "3943aa6e.c88a36",
+    "id": "58f42d60.f5c1ac",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1802.3333129882812,
-    "y": 1274.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1945,
+    "y": 1173,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "c08ad06c.488d4"
+        "5eba1f1e.c5c1c"
       ]
     ]
   },
   {
-    "id": "47637f28.c69c6",
+    "id": "2233c963.7160de",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1809.3333129882812,
-    "y": 1319.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1952,
+    "y": 1218,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2ee2b867.995c6"
+        "14e15bd9.f573a4"
       ]
     ]
   },
   {
-    "id": "6a61eaa3.28143c",
+    "id": "17bdedbb.6d9ba2",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1808.3333129882812,
-    "y": 1359.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1951,
+    "y": 1258,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e35c4fb2.169e68"
+        "1bdb940e.a70dfc"
       ]
     ]
   },
   {
-    "id": "9b8bc380.4fea78",
+    "id": "45fa8d37.dd8774",
     "type": "switchNode",
     "name": "switch conn type != mdsc",
     "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type != 'mdsc' `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 442.8999786376953,
-    "y": 1218.9333572387695,
-    "z": "88b99be5.091bf8",
+    "x": 585.5666656494141,
+    "y": 1117.933349609375,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "77dc380.c063d48"
+        "4985dcd9.148044"
       ]
     ]
   },
   {
-    "id": "77dc380.c063d48",
+    "id": "4985dcd9.148044",
     "type": "outcome",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 624.8999633789062,
-    "y": 1219.9333572387695,
-    "z": "88b99be5.091bf8",
+    "x": 767.566650390625,
+    "y": 1118.933349609375,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4162fe05.2b911"
+        "87edee65.85ae28"
       ]
     ]
   },
   {
-    "id": "ad8e54c3.d3fe18",
+    "id": "d6d125c6.7c1ef",
     "type": "set",
     "name": "unset ethernet-srv-end-points-list",
     "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
     "comments": "",
-    "x": 760.8999633789062,
-    "y": 1396.966682434082,
-    "z": "88b99be5.091bf8",
+    "x": 903.566650390625,
+    "y": 1295.9666748046875,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "63370d02.a0670c",
+    "id": "1210758a.a607e2",
     "type": "execute",
     "name": "execute RestApiCallNode Create Performance Monitoring Data",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1386.3333740234375,
-    "y": 2738.33349609375,
-    "z": "88b99be5.091bf8",
+    "x": 1529.0000610351562,
+    "y": 2637.3334884643555,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ca90fe2.261db8",
+    "id": "9f2557cf.e0f36",
     "type": "execute",
     "name": "execute RestconfDiscoveryNode establishSubscription",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1354.3333740234375,
-    "y": 2810.3333740234375,
-    "z": "88b99be5.091bf8",
+    "x": 1497.0000610351562,
+    "y": 2709.333366394043,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "2ecfa879.64974",
+    "id": "c6235f90.04d29",
     "type": "execute",
     "name": "execute RestconfDiscoveryNode establishPersistentConnection",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1384.3333740234375,
-    "y": 2872.3333740234375,
-    "z": "88b99be5.091bf8",
+    "x": 1527.0000610351562,
+    "y": 2771.333366394043,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
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 9697f148..a522c416 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,199 +1,199 @@
 [
     {
-        "id": "a7aee3f0.b04268",
+        "id": "9ee6a3c1.bedb",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 400.566650390625,
-        "y": 374,
-        "z": "b25656d7.85a8a8",
+        "x": 450.33331298828125,
+        "y": 350.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "96c8722a.b993c",
-                "e5061783.573db8",
-                "6a27552b.ad1ba4"
+                "3d418b0.8302bf6",
+                "48d7e3bc.f2883c",
+                "8ec621b1.80ebc8"
             ]
         ]
     },
     {
-        "id": "96c8722a.b993c",
+        "id": "3d418b0.8302bf6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 588.566650390625,
-        "y": 387,
-        "z": "b25656d7.85a8a8",
+        "x": 638.3333129882812,
+        "y": 363.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "41e4d89f.ed1468"
+                "9c98306.e2cffd"
             ]
         ]
     },
     {
-        "id": "e5061783.573db8",
+        "id": "48d7e3bc.f2883c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 596.0575866699219,
-        "y": 429.57403564453125,
-        "z": "b25656d7.85a8a8",
+        "x": 645.8242492675781,
+        "y": 405.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a27552b.ad1ba4",
+        "id": "8ec621b1.80ebc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 586.566650390625,
-        "y": 476,
-        "z": "b25656d7.85a8a8",
+        "x": 636.3333129882812,
+        "y": 452.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a92b97b8.4129e8"
+                "57052eb0.583298"
             ]
         ]
     },
     {
-        "id": "41e4d89f.ed1468",
+        "id": "9c98306.e2cffd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 761.566650390625,
-        "y": 385,
-        "z": "b25656d7.85a8a8",
+        "x": 811.3333129882812,
+        "y": 361.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "cbc7d636.2def18"
+                "53767e53.94959"
             ]
         ]
     },
     {
-        "id": "cbc7d636.2def18",
+        "id": "53767e53.94959",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 990.566650390625,
-        "y": 386,
-        "z": "b25656d7.85a8a8",
+        "x": 1040.3333129882812,
+        "y": 362.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "39ab6bfa.74801c"
+                "c415e278.f5611"
             ]
         ]
     },
     {
-        "id": "39ab6bfa.74801c",
+        "id": "c415e278.f5611",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1205.566650390625,
-        "y": 387,
-        "z": "b25656d7.85a8a8",
+        "x": 1255.3333129882812,
+        "y": 363.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e124b2ef.0bfdc8"
+                "c71ad5b.64b44a8"
             ]
         ]
     },
     {
-        "id": "f6144c8.446efb",
+        "id": "3d675d8e.b88daa",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1459.566650390625,
-        "y": 309,
-        "z": "b25656d7.85a8a8",
+        "x": 1509.3333129882812,
+        "y": 285.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "dc53b823.c6e998",
-                "b2e345a3.6b81"
+                "bbedabe9.bd4b",
+                "34793819.776c6"
             ]
         ]
     },
     {
-        "id": "dc53b823.c6e998",
+        "id": "bbedabe9.bd4b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1676.566650390625,
-        "y": 288,
-        "z": "b25656d7.85a8a8",
+        "x": 1726.3333129882812,
+        "y": 264.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e124b2ef.0bfdc8"
+                "c71ad5b.64b44a8"
             ]
         ]
     },
     {
-        "id": "b2e345a3.6b81",
+        "id": "34793819.776c6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1676.566650390625,
-        "y": 337,
-        "z": "b25656d7.85a8a8",
+        "x": 1726.3333129882812,
+        "y": 313.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e124b2ef.0bfdc8",
+        "id": "c71ad5b.64b44a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1860.566650390625,
-        "y": 374,
-        "z": "b25656d7.85a8a8",
+        "x": 1910.3333129882812,
+        "y": 350.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2ac81333.5163cc",
-                "ce04a89c.bde61",
-                "b01d3963.8ea8b8"
+                "3dd08dae.27e4a2",
+                "52a060f7.3567c8",
+                "a8591f2d.71e23"
             ]
         ]
     },
     {
-        "id": "daba1b59.df55a",
+        "id": "e6629469.2dd4b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 219.566650390625,
-        "y": 115,
-        "z": "b25656d7.85a8a8",
+        "x": 269.33331298828125,
+        "y": 91.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "53bce33c.ae731c"
+                "e4a2a292.f645d8"
             ]
         ]
     },
     {
-        "id": "53bce33c.ae731c",
+        "id": "e4a2a292.f645d8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3711 +201,3711 @@
         "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": 503.8523406982422,
-        "y": 176.23810863494873,
-        "z": "b25656d7.85a8a8",
+        "x": 553.6190032958984,
+        "y": 152.23811626434326,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "13dd53c4.ce4fbc"
+                "94591033.455c8"
             ]
         ]
     },
     {
-        "id": "13dd53c4.ce4fbc",
+        "id": "94591033.455c8",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 509.99525451660156,
-        "y": 261.0000305175781,
-        "z": "b25656d7.85a8a8",
+        "x": 559.7619171142578,
+        "y": 237.00003814697266,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "60b5835f.a436c4"
+                "fa712947.37c038"
             ]
         ]
     },
     {
-        "id": "60b5835f.a436c4",
+        "id": "fa712947.37c038",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 819.8046875,
-        "y": 252.66668701171875,
-        "z": "b25656d7.85a8a8",
+        "x": 869.5713500976562,
+        "y": 228.66669464111328,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a7aee3f0.b04268",
-                "6d17c7fb.4906d8",
-                "7de7f253.4369ac",
-                "731e9165.7bfe5",
-                "c3d34fd5.00b8e8"
+                "9ee6a3c1.bedb",
+                "b5b4ab5e.850cd8",
+                "8297c516.b14308",
+                "e7860d61.a71378",
+                "a8115aec.3c3d6"
             ]
         ]
     },
     {
-        "id": "2ac81333.5163cc",
+        "id": "3dd08dae.27e4a2",
         "type": "set",
         "name": "set tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
-        "x": 2077.566650390625,
-        "y": 312,
-        "z": "b25656d7.85a8a8",
+        "x": 2127.3333129882812,
+        "y": 288.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "581b9833.ca5308",
+        "id": "a8b9f4f8.1eb4e8",
         "type": "set",
         "name": "set attachment_param for OTN A",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
-        "x": 4246.566650390625,
-        "y": 198,
-        "z": "b25656d7.85a8a8",
+        "x": 4296.333312988281,
+        "y": 174.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c57ed1b4.089b78",
+        "id": "24ae2ddb.2d91ca",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4327.566650390625,
-        "y": 513,
-        "z": "b25656d7.85a8a8",
+        "x": 4377.333312988281,
+        "y": 489.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6866347a.b34054",
-                "d9ef66bb.b2e3a"
+                "d90569fe.c301e",
+                "9a0fd68f.7364"
             ]
         ]
     },
     {
-        "id": "6866347a.b34054",
+        "id": "d90569fe.c301e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4637.066650390625,
-        "y": 482,
-        "z": "b25656d7.85a8a8",
+        "x": 4686.833312988281,
+        "y": 458.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "351f2ca1.efff8c"
+                "bfcc154c.9d015"
             ]
         ]
     },
     {
-        "id": "d9ef66bb.b2e3a",
+        "id": "9a0fd68f.7364",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4642.066650390625,
-        "y": 547,
-        "z": "b25656d7.85a8a8",
+        "x": 4691.833312988281,
+        "y": 523.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7ec1daf0.49ebbc"
+                "5fe18426.281bd4"
             ]
         ]
     },
     {
-        "id": "351f2ca1.efff8c",
+        "id": "bfcc154c.9d015",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4813.066650390625,
-        "y": 482,
-        "z": "b25656d7.85a8a8",
+        "x": 4862.833312988281,
+        "y": 458.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7ec1daf0.49ebbc",
+        "id": "5fe18426.281bd4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4808.566650390625,
-        "y": 547,
-        "z": "b25656d7.85a8a8",
+        "x": 4858.333312988281,
+        "y": 523.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "fe354f09.d7eaa",
+        "id": "3e254ec8.8f602a",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
-        "x": 4192.066650390625,
-        "y": 767,
-        "z": "b25656d7.85a8a8",
+        "x": 4241.833312988281,
+        "y": 743.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f82c7890.c5a3a",
+        "id": "4a6469cd.4f0b98",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4346.066650390625,
-        "y": 815,
-        "z": "b25656d7.85a8a8",
+        "x": 4395.833312988281,
+        "y": 791.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "66ca2f72.5d0ea",
-                "384ae824.cd397"
+                "826c2f73.5d5e88",
+                "403359b0.843728"
             ]
         ]
     },
     {
-        "id": "66ca2f72.5d0ea",
+        "id": "826c2f73.5d5e88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4691.566650390625,
-        "y": 796,
-        "z": "b25656d7.85a8a8",
+        "x": 4741.333312988281,
+        "y": 772.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8897aa30.2d04c"
+                "80c327f3.9b168"
             ]
         ]
     },
     {
-        "id": "384ae824.cd397",
+        "id": "403359b0.843728",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4695.566650390625,
-        "y": 836,
-        "z": "b25656d7.85a8a8",
+        "x": 4745.333312988281,
+        "y": 812.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e98f7531.5d07d8"
+                "6ab9c98a.fce4d8"
             ]
         ]
     },
     {
-        "id": "8897aa30.2d04c",
+        "id": "80c327f3.9b168",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4849.566650390625,
-        "y": 796,
-        "z": "b25656d7.85a8a8",
+        "x": 4899.333312988281,
+        "y": 772.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "e98f7531.5d07d8",
+        "id": "6ab9c98a.fce4d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4853.066650390625,
-        "y": 836,
-        "z": "b25656d7.85a8a8",
+        "x": 4902.833312988281,
+        "y": 812.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3b168b09.265424",
-                "f9e9fb1f.d5d228"
+                "e1c867b8.192bd",
+                "913acec9.956098"
             ]
         ]
     },
     {
-        "id": "3b168b09.265424",
+        "id": "e1c867b8.192bd",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5183.566650390625,
-        "y": 801,
-        "z": "b25656d7.85a8a8",
+        "x": 5233.333312988281,
+        "y": 777.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "293d08cf.5ba9b",
+        "id": "b428e7f5.22dd58",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 5047.566650390625,
-        "y": 760,
-        "z": "b25656d7.85a8a8",
+        "x": 5097.333312988281,
+        "y": 736.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f9e9fb1f.d5d228",
+        "id": "913acec9.956098",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5110.566650390625,
-        "y": 847,
-        "z": "b25656d7.85a8a8",
+        "x": 5160.333312988281,
+        "y": 823.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b448e3f.d6f97",
+        "id": "c0a903ed.d424f",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4184.566650390625,
-        "y": 246,
-        "z": "b25656d7.85a8a8",
+        "x": 4234.333312988281,
+        "y": 222.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "11357d7a.7ec893",
+        "id": "c9a2a428.5985e8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4210.566650390625,
-        "y": 363,
-        "z": "b25656d7.85a8a8",
+        "x": 4260.333312988281,
+        "y": 339.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9cee4545.4afd2",
-                "c87207dc.1fc4c8",
-                "a541f904.08a73"
+                "fe7b0b4f.4f25b8",
+                "1f23a1db.9239d6",
+                "80067a1b.7e8398"
             ]
         ]
     },
     {
-        "id": "9cee4545.4afd2",
+        "id": "fe7b0b4f.4f25b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4406.0667724609375,
-        "y": 315,
-        "z": "b25656d7.85a8a8",
+        "x": 4455.833435058594,
+        "y": 291.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "174041c6.ef00ae"
+                "b7ec9659.601c4"
             ]
         ]
     },
     {
-        "id": "c87207dc.1fc4c8",
+        "id": "1f23a1db.9239d6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4398.0667724609375,
-        "y": 370,
-        "z": "b25656d7.85a8a8",
+        "x": 4447.833435058594,
+        "y": 346.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2578a714.32fd88"
+                "fe1da93b.8b0db8"
             ]
         ]
     },
     {
-        "id": "174041c6.ef00ae",
+        "id": "b7ec9659.601c4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4550.4490966796875,
-        "y": 314.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 4600.215759277344,
+        "y": 290.65567779541016,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "44c47bf6.544e84"
+                "5d87f5d0.3bfe2c"
             ]
         ]
     },
     {
-        "id": "416e074e.1652a8",
+        "id": "4b9cdc3a.96a434",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5132.566650390625,
-        "y": 317,
-        "z": "b25656d7.85a8a8",
+        "x": 5182.333312988281,
+        "y": 293.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "77699d71.cb9cbc"
+                "c5c0e693.b5a978"
             ]
         ]
     },
     {
-        "id": "44c47bf6.544e84",
+        "id": "5d87f5d0.3bfe2c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4734.566650390625,
-        "y": 313,
-        "z": "b25656d7.85a8a8",
+        "x": 4784.333312988281,
+        "y": 289.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ec3ad4d7.e6b51"
+                "3668fdab.2d6312"
             ]
         ]
     },
     {
-        "id": "ec3ad4d7.e6b51",
+        "id": "3668fdab.2d6312",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4929.566650390625,
-        "y": 313,
-        "z": "b25656d7.85a8a8",
+        "x": 4979.333312988281,
+        "y": 289.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "416e074e.1652a8"
+                "4b9cdc3a.96a434"
             ]
         ]
     },
     {
-        "id": "a541f904.08a73",
+        "id": "80067a1b.7e8398",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4403.0667724609375,
-        "y": 427,
-        "z": "b25656d7.85a8a8",
+        "x": 4452.833435058594,
+        "y": 403.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "44c8faa6.17201c"
+                "72f714cc.b21364"
             ]
         ]
     },
     {
-        "id": "44c8faa6.17201c",
+        "id": "72f714cc.b21364",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4555.0667724609375,
-        "y": 428,
-        "z": "b25656d7.85a8a8",
+        "x": 4604.833435058594,
+        "y": 404.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2578a714.32fd88",
+        "id": "fe1da93b.8b0db8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4566.0667724609375,
-        "y": 371,
-        "z": "b25656d7.85a8a8",
+        "x": 4615.833435058594,
+        "y": 347.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "157b4f1e.ec4409",
+        "id": "247e40ac.03f008",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5517.566650390625,
-        "y": 330,
-        "z": "b25656d7.85a8a8",
+        "x": 5567.333312988281,
+        "y": 306.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5eb578c.a510488",
-                "646e1345.d32534",
-                "d2cac0b5.69fe18"
+                "2769fc5a.203d24",
+                "510b4bec.e64154",
+                "dc91b912.6316b8"
             ]
         ]
     },
     {
-        "id": "77699d71.cb9cbc",
+        "id": "c5c0e693.b5a978",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5311.566650390625,
-        "y": 317,
-        "z": "b25656d7.85a8a8",
+        "x": 5361.333312988281,
+        "y": 293.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e5b6fb7a.6fa868",
-                "157b4f1e.ec4409"
+                "d3a253e8.52c87",
+                "247e40ac.03f008"
             ]
         ]
     },
     {
-        "id": "e5b6fb7a.6fa868",
+        "id": "d3a253e8.52c87",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5547.566650390625,
-        "y": 278,
-        "z": "b25656d7.85a8a8",
+        "x": 5597.333312988281,
+        "y": 254.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5eb578c.a510488",
+        "id": "2769fc5a.203d24",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5727.566650390625,
-        "y": 321,
-        "z": "b25656d7.85a8a8",
+        "x": 5777.333312988281,
+        "y": 297.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e92c3ae0.67c78"
+                "373ad72a.24ed2"
             ]
         ]
     },
     {
-        "id": "646e1345.d32534",
+        "id": "510b4bec.e64154",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5719.566650390625,
-        "y": 376,
-        "z": "b25656d7.85a8a8",
+        "x": 5769.333312988281,
+        "y": 352.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bbc83f99.73f6"
+                "fed052ea.46fa"
             ]
         ]
     },
     {
-        "id": "d2cac0b5.69fe18",
+        "id": "dc91b912.6316b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5724.566650390625,
-        "y": 433,
-        "z": "b25656d7.85a8a8",
+        "x": 5774.333312988281,
+        "y": 409.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2b4662b0.39c236"
+                "62129ad3.e59fd4"
             ]
         ]
     },
     {
-        "id": "2b4662b0.39c236",
+        "id": "62129ad3.e59fd4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5876.566650390625,
-        "y": 434,
-        "z": "b25656d7.85a8a8",
+        "x": 5926.333312988281,
+        "y": 410.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "bbc83f99.73f6",
+        "id": "fed052ea.46fa",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5887.566650390625,
-        "y": 379,
-        "z": "b25656d7.85a8a8",
+        "x": 5937.333312988281,
+        "y": 355.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "e92c3ae0.67c78",
+        "id": "373ad72a.24ed2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5871.948974609375,
-        "y": 318.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 5921.715637207031,
+        "y": 294.65567779541016,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "79f8358f.b45374"
+                "53739ad0.387d34"
             ]
         ]
     },
     {
-        "id": "79f8358f.b45374",
+        "id": "53739ad0.387d34",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 6086.566650390625,
-        "y": 315,
-        "z": "b25656d7.85a8a8",
+        "x": 6136.333312988281,
+        "y": 291.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ffd19574.4197a8",
+        "id": "a04b7e22.2aeb18",
         "type": "set",
         "name": "set attachment_param for OTN B",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 3653.566650390625,
-        "y": 1655,
-        "z": "b25656d7.85a8a8",
+        "x": 3703.3333129882812,
+        "y": 1631.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "bd3c5166.6aead",
+        "id": "a747fd61.4d43f8",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3716.566650390625,
-        "y": 1984,
-        "z": "b25656d7.85a8a8",
+        "x": 3766.3333129882812,
+        "y": 1960.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "85a267fb.c74d5",
-                "1abf40e9.7b1f1f"
+                "1746de51.5350e2",
+                "3d545b09.cac1fc"
             ]
         ]
     },
     {
-        "id": "85a267fb.c74d5",
+        "id": "1746de51.5350e2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4012.066650390625,
-        "y": 1951,
-        "z": "b25656d7.85a8a8",
+        "x": 4061.8333129882812,
+        "y": 1927.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8944bada.8beb4"
+                "fee57d61.96dd7"
             ]
         ]
     },
     {
-        "id": "1abf40e9.7b1f1f",
+        "id": "3d545b09.cac1fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4017.066650390625,
-        "y": 2016,
-        "z": "b25656d7.85a8a8",
+        "x": 4066.8333129882812,
+        "y": 1992.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fa8bf7ac.5ecf28"
+                "3e571aef.d1d9c6"
             ]
         ]
     },
     {
-        "id": "8944bada.8beb4",
+        "id": "fee57d61.96dd7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4180.066650390625,
-        "y": 1951,
-        "z": "b25656d7.85a8a8",
+        "x": 4229.833312988281,
+        "y": 1927.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "fa8bf7ac.5ecf28",
+        "id": "3e571aef.d1d9c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4190.566650390625,
-        "y": 2016,
-        "z": "b25656d7.85a8a8",
+        "x": 4240.333312988281,
+        "y": 1992.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3d71f0.616b0e",
+        "id": "c298ee7.360a71",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
         "comments": "",
-        "x": 3592.566650390625,
-        "y": 1712,
-        "z": "b25656d7.85a8a8",
+        "x": 3642.3333129882812,
+        "y": 1688.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5f81a64c.5bf2a",
+        "id": "374df09c.221b4",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3612.566650390625,
-        "y": 1809,
-        "z": "b25656d7.85a8a8",
+        "x": 3662.3333129882812,
+        "y": 1785.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1781a1bd.0348ce",
-                "e03bcd54.697738",
-                "94b9ef51.5409d"
+                "b8613e52.06e248",
+                "b100c849.f8697",
+                "9726d82.0cb02a8"
             ]
         ]
     },
     {
-        "id": "1781a1bd.0348ce",
+        "id": "b8613e52.06e248",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3815.0667724609375,
-        "y": 1762,
-        "z": "b25656d7.85a8a8",
+        "x": 3864.8334350585938,
+        "y": 1738.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a95165c1.f614f8"
+                "fe5dc3f.664f44"
             ]
         ]
     },
     {
-        "id": "e03bcd54.697738",
+        "id": "b100c849.f8697",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3807.0667724609375,
-        "y": 1817,
-        "z": "b25656d7.85a8a8",
+        "x": 3856.8334350585938,
+        "y": 1793.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b5b6c797.75de6"
+                "45b746dd.1fc3c8"
             ]
         ]
     },
     {
-        "id": "a95165c1.f614f8",
+        "id": "fe5dc3f.664f44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3959.4490966796875,
-        "y": 1759.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 4009.2157592773438,
+        "y": 1735.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5bb225c8.c4c70c"
+                "38c123a7.87ff54"
             ]
         ]
     },
     {
-        "id": "5bb225c8.c4c70c",
+        "id": "38c123a7.87ff54",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4143.566650390625,
-        "y": 1774,
-        "z": "b25656d7.85a8a8",
+        "x": 4193.333312988281,
+        "y": 1750.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7747e85a.705d5"
+                "8269be24.8785c8"
             ]
         ]
     },
     {
-        "id": "94b9ef51.5409d",
+        "id": "9726d82.0cb02a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3812.0667724609375,
-        "y": 1874,
-        "z": "b25656d7.85a8a8",
+        "x": 3861.8334350585938,
+        "y": 1850.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9d4f33d7.c972d"
+                "920b3194.25369"
             ]
         ]
     },
     {
-        "id": "9d4f33d7.c972d",
+        "id": "920b3194.25369",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3964.0667724609375,
-        "y": 1875,
-        "z": "b25656d7.85a8a8",
+        "x": 4013.8334350585938,
+        "y": 1851.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b5b6c797.75de6",
+        "id": "45b746dd.1fc3c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3975.0667724609375,
-        "y": 1820,
-        "z": "b25656d7.85a8a8",
+        "x": 4024.8334350585938,
+        "y": 1796.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7641eade.641374",
+        "id": "3be7fe46.7bed5a",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4541.566650390625,
-        "y": 1778,
-        "z": "b25656d7.85a8a8",
+        "x": 4591.333312988281,
+        "y": 1754.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "745d7190.9cf208"
+                "9242c93c.f02488"
             ]
         ]
     },
     {
-        "id": "7747e85a.705d5",
+        "id": "8269be24.8785c8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4338.566650390625,
-        "y": 1774,
-        "z": "b25656d7.85a8a8",
+        "x": 4388.333312988281,
+        "y": 1750.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7641eade.641374"
+                "3be7fe46.7bed5a"
             ]
         ]
     },
     {
-        "id": "95464c66.d9ff8",
+        "id": "24d5bcbc.e5fd54",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4926.566650390625,
-        "y": 1777,
-        "z": "b25656d7.85a8a8",
+        "x": 4976.333312988281,
+        "y": 1753.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bb6dbaba.ff1548",
-                "a59e3175.15a9b",
-                "4bc34556.41323c"
+                "7fafe45b.58f05c",
+                "c7d3d0e7.e6edb8",
+                "2bbce26d.997346"
             ]
         ]
     },
     {
-        "id": "745d7190.9cf208",
+        "id": "9242c93c.f02488",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4718.566650390625,
-        "y": 1770,
-        "z": "b25656d7.85a8a8",
+        "x": 4768.333312988281,
+        "y": 1746.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "80afd84e.d6bdd8",
-                "95464c66.d9ff8"
+                "4aece362.c97204",
+                "24d5bcbc.e5fd54"
             ]
         ]
     },
     {
-        "id": "80afd84e.d6bdd8",
+        "id": "4aece362.c97204",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4956.566650390625,
-        "y": 1725,
-        "z": "b25656d7.85a8a8",
+        "x": 5006.333312988281,
+        "y": 1701.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "42edd12e.5451d",
+        "id": "5653f279.fa187c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5285.566650390625,
-        "y": 1881,
-        "z": "b25656d7.85a8a8",
+        "x": 5335.333312988281,
+        "y": 1857.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ea697aed.d1f358",
+        "id": "991ab386.c1ab2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5296.566650390625,
-        "y": 1826,
-        "z": "b25656d7.85a8a8",
+        "x": 5346.333312988281,
+        "y": 1802.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "edcb3571.8c6728",
+        "id": "f903abd6.bcb5e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5280.948974609375,
-        "y": 1765.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 5330.715637207031,
+        "y": 1741.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6d55462a.8f8fa8"
+                "9d78b23c.6c7458"
             ]
         ]
     },
     {
-        "id": "6d55462a.8f8fa8",
+        "id": "9d78b23c.6c7458",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5495.566650390625,
-        "y": 1762,
-        "z": "b25656d7.85a8a8",
+        "x": 5545.333312988281,
+        "y": 1738.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "bb6dbaba.ff1548",
+        "id": "7fafe45b.58f05c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5136.566650390625,
-        "y": 1768,
-        "z": "b25656d7.85a8a8",
+        "x": 5186.333312988281,
+        "y": 1744.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "edcb3571.8c6728"
+                "f903abd6.bcb5e"
             ]
         ]
     },
     {
-        "id": "a59e3175.15a9b",
+        "id": "c7d3d0e7.e6edb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5128.566650390625,
-        "y": 1823,
-        "z": "b25656d7.85a8a8",
+        "x": 5178.333312988281,
+        "y": 1799.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ea697aed.d1f358"
+                "991ab386.c1ab2"
             ]
         ]
     },
     {
-        "id": "4bc34556.41323c",
+        "id": "2bbce26d.997346",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5133.566650390625,
-        "y": 1880,
-        "z": "b25656d7.85a8a8",
+        "x": 5183.333312988281,
+        "y": 1856.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "42edd12e.5451d"
+                "5653f279.fa187c"
             ]
         ]
     },
     {
-        "id": "64ebcb8e.6a273c",
+        "id": "d6212bc2.789e7",
         "type": "switchNode",
         "name": "switch vpn-binding has dst-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3167.566650390625,
-        "y": 726,
-        "z": "b25656d7.85a8a8",
+        "x": 3217.3333129882812,
+        "y": 702.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "635bfedd.0eff1",
-                "4466b072.e153e8"
+                "e3d89802.393a78",
+                "22a27baf.15e97c"
             ]
         ]
     },
     {
-        "id": "635bfedd.0eff1",
+        "id": "e3d89802.393a78",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3381.566650390625,
-        "y": 763,
-        "z": "b25656d7.85a8a8",
+        "x": 3431.3333129882812,
+        "y": 739.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f20f4b09.4270d8"
+                "793df4ee.f1df74"
             ]
         ]
     },
     {
-        "id": "4466b072.e153e8",
+        "id": "22a27baf.15e97c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3383.566650390625,
-        "y": 701,
-        "z": "b25656d7.85a8a8",
+        "x": 3433.3333129882812,
+        "y": 677.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "388a019b.9b73c6"
+                "7ecfd25a.90cdcc"
             ]
         ]
     },
     {
-        "id": "f20f4b09.4270d8",
+        "id": "793df4ee.f1df74",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2961.566650390625,
-        "y": 2006,
-        "z": "b25656d7.85a8a8",
+        "x": 3011.3333129882812,
+        "y": 1982.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "69af1ba1.41260c",
-                "13b2b9f.1f67dc6"
+                "3123087e.cfd848",
+                "426b4898.f559d8"
             ]
         ]
     },
     {
-        "id": "69af1ba1.41260c",
+        "id": "3123087e.cfd848",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3214.566650390625,
-        "y": 2040,
-        "z": "b25656d7.85a8a8",
+        "x": 3264.3333129882812,
+        "y": 2016.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c8858f37.c3f05"
+                "534033f3.f59e9c"
             ]
         ]
     },
     {
-        "id": "13b2b9f.1f67dc6",
+        "id": "426b4898.f559d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3214.566650390625,
-        "y": 1984,
-        "z": "b25656d7.85a8a8",
+        "x": 3264.3333129882812,
+        "y": 1960.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "be4790f9.3bf898"
+                "d5f2676f.c2a88"
             ]
         ]
     },
     {
-        "id": "c8858f37.c3f05",
+        "id": "534033f3.f59e9c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3365.566650390625,
-        "y": 2040,
-        "z": "b25656d7.85a8a8",
+        "x": 3415.3333129882812,
+        "y": 2016.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7a5e210e.9e5d48",
+        "id": "c77b264c.fe2528",
         "type": "set",
         "name": "set vpn-bindingA and connectivityA",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4241.566650390625,
-        "y": 138,
-        "z": "b25656d7.85a8a8",
+        "x": 4291.333312988281,
+        "y": 114.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "163461bd.87a87e",
+        "id": "6ed23267.9185fc",
         "type": "set",
         "name": "set vpn-bindingB and connectivityB",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
         "comments": "",
-        "x": 3649.566650390625,
-        "y": 1597,
-        "z": "b25656d7.85a8a8",
+        "x": 3699.3333129882812,
+        "y": 1573.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "354c57ea.e71ee8",
+        "id": "7d0cb107.7824a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3932.566650390625,
-        "y": 395,
-        "z": "b25656d7.85a8a8",
+        "x": 3982.3333129882812,
+        "y": 371.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7a5e210e.9e5d48",
-                "581b9833.ca5308",
-                "5b448e3f.d6f97",
-                "11357d7a.7ec893",
-                "c57ed1b4.089b78",
-                "5d6e99f5.a1e2d",
-                "1771c9d3.36c546",
-                "d9cf64bd.4ed12"
+                "c77b264c.fe2528",
+                "a8b9f4f8.1eb4e8",
+                "c0a903ed.d424f",
+                "c9a2a428.5985e8",
+                "24ae2ddb.2d91ca",
+                "1656bf6f.d0ade1",
+                "d2ff3c56.4372d",
+                "9499a947.255148"
             ]
         ]
     },
     {
-        "id": "be4790f9.3bf898",
+        "id": "d5f2676f.c2a88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3365.566650390625,
-        "y": 1983,
-        "z": "b25656d7.85a8a8",
+        "x": 3415.3333129882812,
+        "y": 1959.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "163461bd.87a87e",
-                "ffd19574.4197a8",
-                "e3d71f0.616b0e",
-                "5f81a64c.5bf2a",
-                "bd3c5166.6aead",
-                "b596d9f.c7daaa8",
-                "2308c235.08d20e",
-                "5a0cb184.9cdf98"
+                "6ed23267.9185fc",
+                "a04b7e22.2aeb18",
+                "c298ee7.360a71",
+                "374df09c.221b4",
+                "a747fd61.4d43f8",
+                "ad599918.3fac7",
+                "cedd744c.d4173",
+                "c2c48b41.449c5"
             ]
         ]
     },
     {
-        "id": "12d5b667.53ec1a",
+        "id": "dd92322c.d6fdb",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3603.566650390625,
-        "y": 2282,
-        "z": "b25656d7.85a8a8",
+        "x": 3653.3333129882812,
+        "y": 2258.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b0af817e.3df5c",
+        "id": "4e1fc9cd.44e65",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3757.566650390625,
-        "y": 2330,
-        "z": "b25656d7.85a8a8",
+        "x": 3807.3333129882812,
+        "y": 2306.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8bd672ae.f97518",
-                "171382a6.de96c5"
+                "3bc05be0.577364",
+                "9453988b.761fc"
             ]
         ]
     },
     {
-        "id": "8bd672ae.f97518",
+        "id": "3bc05be0.577364",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4103.066650390625,
-        "y": 2311,
-        "z": "b25656d7.85a8a8",
+        "x": 4152.833312988281,
+        "y": 2287.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "26f501a4.aaf356"
+                "48b1874d.6dc6a"
             ]
         ]
     },
     {
-        "id": "171382a6.de96c5",
+        "id": "9453988b.761fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4107.066650390625,
-        "y": 2351,
-        "z": "b25656d7.85a8a8",
+        "x": 4156.833312988281,
+        "y": 2327.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "81506f95.53e78"
+                "e2a44822.8eb888"
             ]
         ]
     },
     {
-        "id": "26f501a4.aaf356",
+        "id": "48b1874d.6dc6a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4261.066650390625,
-        "y": 2311,
-        "z": "b25656d7.85a8a8",
+        "x": 4310.833312988281,
+        "y": 2287.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "81506f95.53e78",
+        "id": "e2a44822.8eb888",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4264.566650390625,
-        "y": 2351,
-        "z": "b25656d7.85a8a8",
+        "x": 4314.333312988281,
+        "y": 2327.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8a72bd7f.2b673",
-                "2efc6876.725c8"
+                "3369ff99.af45f",
+                "6ce9279e.5956d"
             ]
         ]
     },
     {
-        "id": "8a72bd7f.2b673",
+        "id": "3369ff99.af45f",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4604.566650390625,
-        "y": 2350,
-        "z": "b25656d7.85a8a8",
+        "x": 4654.333312988281,
+        "y": 2326.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "52aaed09.836384",
+        "id": "64323d0d.a53eec",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4462.566650390625,
-        "y": 2308,
-        "z": "b25656d7.85a8a8",
+        "x": 4512.333312988281,
+        "y": 2284.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2efc6876.725c8",
+        "id": "6ce9279e.5956d",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4533.566650390625,
-        "y": 2399,
-        "z": "b25656d7.85a8a8",
+        "x": 4583.333312988281,
+        "y": 2375.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "601ee7c2.7cf4c8",
+        "id": "8b193137.7290b",
         "type": "set",
         "name": "set attachment_param (gfp-n) for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3158.566650390625,
-        "y": 666,
-        "z": "b25656d7.85a8a8",
+        "x": 3208.3333129882812,
+        "y": 642.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f8b99cf2.a93e78",
+        "id": "6b6c5120.d697b",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3753.566650390625,
-        "y": 352,
-        "z": "b25656d7.85a8a8",
+        "x": 3803.3333129882812,
+        "y": 328.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ba2b5c4f.29126",
+        "id": "7a49b0ec.1116e8",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3310.566650390625,
-        "y": 1930,
-        "z": "b25656d7.85a8a8",
+        "x": 3360.3333129882812,
+        "y": 1906.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "388a019b.9b73c6",
+        "id": "7ecfd25a.90cdcc",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3489.566650390625,
-        "y": 514,
-        "z": "b25656d7.85a8a8",
+        "x": 3539.3333129882812,
+        "y": 490.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "60287d21.a15fac",
-                "e673bc57.d2c08"
+                "c5975b58.7cfb78",
+                "8fa5c52a.f6d0f"
             ]
         ]
     },
     {
-        "id": "e673bc57.d2c08",
+        "id": "8fa5c52a.f6d0f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3731.566650390625,
-        "y": 1103,
-        "z": "b25656d7.85a8a8",
+        "x": 3781.3333129882812,
+        "y": 1079.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8e141356.94256"
+                "1a8ceecd.14cfa1"
             ]
         ]
     },
     {
-        "id": "60287d21.a15fac",
+        "id": "c5975b58.7cfb78",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3725.566650390625,
-        "y": 394,
-        "z": "b25656d7.85a8a8",
+        "x": 3775.3333129882812,
+        "y": 370.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "354c57ea.e71ee8"
+                "7d0cb107.7824a8"
             ]
         ]
     },
     {
-        "id": "8e141356.94256",
+        "id": "1a8ceecd.14cfa1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3889.566650390625,
-        "y": 1102,
-        "z": "b25656d7.85a8a8",
+        "x": 3939.3333129882812,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "660dd4a0.d8f1f4",
-                "bd6ec24f.7d2838",
-                "2d50a497.118c24",
-                "60d7ef05.f89ff8",
-                "feec0e79.04d7e8",
-                "6270f9ff.6a6b4"
+                "cfc45fbc.625408",
+                "87ccca6a.f8f9b8",
+                "e86d624f.d5f408",
+                "3e480e6a.3eb6c2",
+                "178f13fb.65189c",
+                "8c5d7664.9247c8"
             ]
         ]
     },
     {
-        "id": "bd6ec24f.7d2838",
+        "id": "87ccca6a.f8f9b8",
         "type": "set",
         "name": "set attachment_param for OTN G",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
         "comments": "",
-        "x": 4153.566650390625,
-        "y": 985,
-        "z": "b25656d7.85a8a8",
+        "x": 4203.333312988281,
+        "y": 961.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "feec0e79.04d7e8",
+        "id": "178f13fb.65189c",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4234.566650390625,
-        "y": 1300,
-        "z": "b25656d7.85a8a8",
+        "x": 4284.333312988281,
+        "y": 1276.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1829c13e.6c182f",
-                "cdc3e429.be6fa"
+                "47471e7d.1bf5e",
+                "2f64742a.d54c2c"
             ]
         ]
     },
     {
-        "id": "1829c13e.6c182f",
+        "id": "47471e7d.1bf5e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4544.066650390625,
-        "y": 1269,
-        "z": "b25656d7.85a8a8",
+        "x": 4593.833312988281,
+        "y": 1245.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5b91a7ec.2e4658"
+                "27252576.feabca"
             ]
         ]
     },
     {
-        "id": "cdc3e429.be6fa",
+        "id": "2f64742a.d54c2c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4549.066650390625,
-        "y": 1334,
-        "z": "b25656d7.85a8a8",
+        "x": 4598.833312988281,
+        "y": 1310.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8046aee4.83e438"
+                "d2def383.359ac8"
             ]
         ]
     },
     {
-        "id": "5b91a7ec.2e4658",
+        "id": "27252576.feabca",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4720.066650390625,
-        "y": 1269,
-        "z": "b25656d7.85a8a8",
+        "x": 4769.833312988281,
+        "y": 1245.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8046aee4.83e438",
+        "id": "d2def383.359ac8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4715.566650390625,
-        "y": 1334,
-        "z": "b25656d7.85a8a8",
+        "x": 4765.333312988281,
+        "y": 1310.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d50a497.118c24",
+        "id": "e86d624f.d5f408",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4091.566650390625,
-        "y": 1033,
-        "z": "b25656d7.85a8a8",
+        "x": 4141.333312988281,
+        "y": 1009.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "60d7ef05.f89ff8",
+        "id": "3e480e6a.3eb6c2",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4117.566650390625,
-        "y": 1150,
-        "z": "b25656d7.85a8a8",
+        "x": 4167.333312988281,
+        "y": 1126.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "684da58c.28fc44",
-                "7420bdce.6aab1c",
-                "21d55314.ed559c"
+                "2fe7a70f.325738",
+                "de56dd13.56cbc",
+                "da128a7e.2de4c8"
             ]
         ]
     },
     {
-        "id": "684da58c.28fc44",
+        "id": "2fe7a70f.325738",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4313.0667724609375,
-        "y": 1102,
-        "z": "b25656d7.85a8a8",
+        "x": 4362.833435058594,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "64489fc6.c8241"
+                "236585d1.bff802"
             ]
         ]
     },
     {
-        "id": "7420bdce.6aab1c",
+        "id": "de56dd13.56cbc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4305.0667724609375,
-        "y": 1157,
-        "z": "b25656d7.85a8a8",
+        "x": 4354.833435058594,
+        "y": 1133.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "92f1b89c.1ab69"
+                "7ab4252e.e507d4"
             ]
         ]
     },
     {
-        "id": "64489fc6.c8241",
+        "id": "236585d1.bff802",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4457.4490966796875,
-        "y": 1101.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 4507.215759277344,
+        "y": 1077.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "48d2ac4e.25f6b4"
+                "d1f5d3f1.d937a8"
             ]
         ]
     },
     {
-        "id": "48d2ac4e.25f6b4",
+        "id": "d1f5d3f1.d937a8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4641.566650390625,
-        "y": 1100,
-        "z": "b25656d7.85a8a8",
+        "x": 4691.333312988281,
+        "y": 1076.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "714ce556.4f2fcc"
+                "b6dba6f2.6f5a68"
             ]
         ]
     },
     {
-        "id": "714ce556.4f2fcc",
+        "id": "b6dba6f2.6f5a68",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4836.566650390625,
-        "y": 1100,
-        "z": "b25656d7.85a8a8",
+        "x": 4886.333312988281,
+        "y": 1076.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2076535.8c263ac"
+                "decb3043.cd12c"
             ]
         ]
     },
     {
-        "id": "21d55314.ed559c",
+        "id": "da128a7e.2de4c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4310.0667724609375,
-        "y": 1214,
-        "z": "b25656d7.85a8a8",
+        "x": 4359.833435058594,
+        "y": 1190.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "45f37411.31ce94"
+                "98ee3a25.1ab9e"
             ]
         ]
     },
     {
-        "id": "45f37411.31ce94",
+        "id": "98ee3a25.1ab9e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4462.0667724609375,
-        "y": 1215,
-        "z": "b25656d7.85a8a8",
+        "x": 4511.833435058594,
+        "y": 1191.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "92f1b89c.1ab69",
+        "id": "7ab4252e.e507d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4473.0667724609375,
-        "y": 1158,
-        "z": "b25656d7.85a8a8",
+        "x": 4522.833435058594,
+        "y": 1134.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "660dd4a0.d8f1f4",
+        "id": "cfc45fbc.625408",
         "type": "set",
         "name": "set vpn-bindingG and connectivityG",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4148.566650390625,
-        "y": 925,
-        "z": "b25656d7.85a8a8",
+        "x": 4198.333312988281,
+        "y": 901.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2076535.8c263ac",
+        "id": "decb3043.cd12c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5039.566650390625,
-        "y": 1104,
-        "z": "b25656d7.85a8a8",
+        "x": 5089.333312988281,
+        "y": 1080.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f782ae02.7309d8"
+                "b6ba573a.60741"
             ]
         ]
     },
     {
-        "id": "4c7d2512.5b4fb4",
+        "id": "f4847f5f.1d887",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5424.566650390625,
-        "y": 1117,
-        "z": "b25656d7.85a8a8",
+        "x": 5474.333312988281,
+        "y": 1093.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f27cc561.589478",
-                "533a9a4e.562074",
-                "f04fcd62.bdef1"
+                "e228c69c.360f98",
+                "9bce816d.2db348",
+                "41d83525.ce00b4"
             ]
         ]
     },
     {
-        "id": "f782ae02.7309d8",
+        "id": "b6ba573a.60741",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5218.566650390625,
-        "y": 1104,
-        "z": "b25656d7.85a8a8",
+        "x": 5268.333312988281,
+        "y": 1080.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "eec3155e.2bcec8",
-                "4c7d2512.5b4fb4"
+                "5b50b3ea.1f8ef4",
+                "f4847f5f.1d887"
             ]
         ]
     },
     {
-        "id": "eec3155e.2bcec8",
+        "id": "5b50b3ea.1f8ef4",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5454.566650390625,
-        "y": 1065,
-        "z": "b25656d7.85a8a8",
+        "x": 5504.333312988281,
+        "y": 1041.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f27cc561.589478",
+        "id": "e228c69c.360f98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5634.566650390625,
-        "y": 1108,
-        "z": "b25656d7.85a8a8",
+        "x": 5684.333312988281,
+        "y": 1084.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "20cc7528.d35caa"
+                "189e198c.62579e"
             ]
         ]
     },
     {
-        "id": "533a9a4e.562074",
+        "id": "9bce816d.2db348",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5626.566650390625,
-        "y": 1163,
-        "z": "b25656d7.85a8a8",
+        "x": 5676.333312988281,
+        "y": 1139.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a99b13d6.7a5b4"
+                "a893456b.716548"
             ]
         ]
     },
     {
-        "id": "f04fcd62.bdef1",
+        "id": "41d83525.ce00b4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5631.566650390625,
-        "y": 1220,
-        "z": "b25656d7.85a8a8",
+        "x": 5681.333312988281,
+        "y": 1196.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "76e3f44a.1be574"
+                "7bd5c1c9.c0b778"
             ]
         ]
     },
     {
-        "id": "76e3f44a.1be574",
+        "id": "7bd5c1c9.c0b778",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5783.566650390625,
-        "y": 1221,
-        "z": "b25656d7.85a8a8",
+        "x": 5833.333312988281,
+        "y": 1197.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a99b13d6.7a5b4",
+        "id": "a893456b.716548",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5794.566650390625,
-        "y": 1166,
-        "z": "b25656d7.85a8a8",
+        "x": 5844.333312988281,
+        "y": 1142.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "20cc7528.d35caa",
+        "id": "189e198c.62579e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5778.948974609375,
-        "y": 1105.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 5828.715637207031,
+        "y": 1081.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "52e6acc9.c6278c"
+                "ae6db88e.b087a"
             ]
         ]
     },
     {
-        "id": "52e6acc9.c6278c",
+        "id": "ae6db88e.b087a",
         "type": "set",
         "name": "set controller domainG data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5993.566650390625,
-        "y": 1102,
-        "z": "b25656d7.85a8a8",
+        "x": 6043.333312988281,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7dd287b6.719d08",
+        "id": "56d817b5.d38a48",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3767.566650390625,
-        "y": 1043,
-        "z": "b25656d7.85a8a8",
+        "x": 3817.3333129882812,
+        "y": 1019.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ce04a89c.bde61",
+        "id": "52a060f7.3567c8",
         "type": "switchNode",
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2329.566650390625,
-        "y": 770,
-        "z": "b25656d7.85a8a8",
+        "x": 2379.3333129882812,
+        "y": 746.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f4c77699.53d898",
-                "9865c4e0.3bcc6"
+                "f7d2b361.6e54e",
+                "d75a20a3.76dfd"
             ]
         ]
     },
     {
-        "id": "9865c4e0.3bcc6",
+        "id": "d75a20a3.76dfd",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2736.566650390625,
-        "y": 788,
-        "z": "b25656d7.85a8a8",
+        "x": 2786.3333129882812,
+        "y": 764.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ad8883f5.8e3298"
+                "87632a9d.0edf7"
             ]
         ]
     },
     {
-        "id": "f4c77699.53d898",
+        "id": "f7d2b361.6e54e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2736.566650390625,
-        "y": 733,
-        "z": "b25656d7.85a8a8",
+        "x": 2786.3333129882812,
+        "y": 709.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e8f3ed6f.2eafd"
+                "d139f1fa.1d1b08"
             ]
         ]
     },
     {
-        "id": "e8f3ed6f.2eafd",
+        "id": "d139f1fa.1d1b08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2892.566650390625,
-        "y": 731,
-        "z": "b25656d7.85a8a8",
+        "x": 2942.3333129882812,
+        "y": 707.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "601ee7c2.7cf4c8",
-                "64ebcb8e.6a273c"
+                "8b193137.7290b",
+                "d6212bc2.789e7"
             ]
         ]
     },
     {
-        "id": "ad8883f5.8e3298",
+        "id": "87632a9d.0edf7",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2869.566650390625,
-        "y": 789,
-        "z": "b25656d7.85a8a8",
+        "x": 2919.3333129882812,
+        "y": 765.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6d17c7fb.4906d8",
+        "id": "b5b4ab5e.850cd8",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 1046.566650390625,
-        "y": 205,
-        "z": "b25656d7.85a8a8",
+        "x": 1096.3333129882812,
+        "y": 181.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c6c6f64f.fccbe8",
+        "id": "7e254bc9.6368cc",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 4163.566650390625,
-        "y": 623,
-        "z": "b25656d7.85a8a8",
+        "x": 4213.333312988281,
+        "y": 599.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5d6e99f5.a1e2d",
+        "id": "1656bf6f.d0ade1",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4223.566650390625,
-        "y": 662,
-        "z": "b25656d7.85a8a8",
+        "x": 4273.333312988281,
+        "y": 638.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7de7f253.4369ac",
+        "id": "8297c516.b14308",
         "type": "set",
         "name": "unset leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",
         "comments": "",
-        "x": 1039.566650390625,
-        "y": 113,
-        "z": "b25656d7.85a8a8",
+        "x": 1089.3333129882812,
+        "y": 89.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9d19ef7b.02af28",
+        "id": "b5552ed0.c09148",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 3575.566650390625,
-        "y": 2139,
-        "z": "b25656d7.85a8a8",
+        "x": 3625.3333129882812,
+        "y": 2115.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b596d9f.c7daaa8",
+        "id": "ad599918.3fac7",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3631.566650390625,
-        "y": 2188,
-        "z": "b25656d7.85a8a8",
+        "x": 3681.3333129882812,
+        "y": 2164.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "aeebae01.261168",
+        "id": "1fbc8dc6.5c716a",
         "type": "set",
         "name": "unset root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",
         "comments": "",
-        "x": 1039.566650390625,
-        "y": 152,
-        "z": "b25656d7.85a8a8",
+        "x": 1089.3333129882812,
+        "y": 128.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "731e9165.7bfe5",
+        "id": "e7860d61.a71378",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1070.566650390625,
-        "y": 253,
-        "z": "b25656d7.85a8a8",
+        "x": 1120.3333129882812,
+        "y": 229.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c3d34fd5.00b8e8",
+        "id": "a8115aec.3c3d6",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 280.566650390625,
-        "y": 728,
-        "z": "b25656d7.85a8a8",
+        "x": 330.33331298828125,
+        "y": 704.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "39350f2.499cf7",
-                "6ce2e49e.7b3484",
-                "5333638f.7ecf8c"
+                "9234c3d4.71d2d8",
+                "71dab0f1.557458",
+                "d5b7dbc9.87e818"
             ]
         ]
     },
     {
-        "id": "39350f2.499cf7",
+        "id": "9234c3d4.71d2d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 499.566650390625,
-        "y": 666,
-        "z": "b25656d7.85a8a8",
+        "x": 549.3333129882812,
+        "y": 642.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "36841c29.6decdc"
+                "deed2b95.51b008"
             ]
         ]
     },
     {
-        "id": "6ce2e49e.7b3484",
+        "id": "71dab0f1.557458",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 509.0576171875,
-        "y": 708.5740356445312,
-        "z": "b25656d7.85a8a8",
+        "x": 558.8242797851562,
+        "y": 684.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5333638f.7ecf8c",
+        "id": "d5b7dbc9.87e818",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 497.566650390625,
-        "y": 755,
-        "z": "b25656d7.85a8a8",
+        "x": 547.3333129882812,
+        "y": 731.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3e93247c.aebb34"
+                "1f43e158.ba10c7"
             ]
         ]
     },
     {
-        "id": "36841c29.6decdc",
+        "id": "deed2b95.51b008",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 696.566650390625,
-        "y": 662,
-        "z": "b25656d7.85a8a8",
+        "x": 746.3333129882812,
+        "y": 638.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1f2c86c7.cadda9"
+                "2dc9974e.fd8eb"
             ]
         ]
     },
     {
-        "id": "3e93247c.aebb34",
+        "id": "1f43e158.ba10c7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 666.566650390625,
-        "y": 756,
-        "z": "b25656d7.85a8a8",
+        "x": 716.3333129882812,
+        "y": 732.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1f2c86c7.cadda9",
+        "id": "2dc9974e.fd8eb",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 919.900146484375,
-        "y": 661.9999389648438,
-        "z": "b25656d7.85a8a8",
+        "x": 969.6668090820312,
+        "y": 637.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a1cbb7bd.24594"
+                "ba6829c9.a61c58"
             ]
         ]
     },
     {
-        "id": "a1cbb7bd.24594",
+        "id": "ba6829c9.a61c58",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1120.5667839050293,
-        "y": 663.000020980835,
-        "z": "b25656d7.85a8a8",
+        "x": 1170.3334465026855,
+        "y": 639.0000286102295,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1f60fbe4.6df234"
+                "64a3ee9a.60466"
             ]
         ]
     },
     {
-        "id": "1f60fbe4.6df234",
+        "id": "64a3ee9a.60466",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 250.566650390625,
-        "y": 925,
-        "z": "b25656d7.85a8a8",
+        "x": 300.33331298828125,
+        "y": 901.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "63c00e4f.b84e58",
-                "13815c78.95eb5c",
-                "e5780368.e11db"
+                "b06f4672.19b5b",
+                "1bbc50b7.a546f7",
+                "46ec206d.bba02"
             ]
         ]
     },
     {
-        "id": "63c00e4f.b84e58",
+        "id": "b06f4672.19b5b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 458.566650390625,
-        "y": 889,
-        "z": "b25656d7.85a8a8",
+        "x": 508.33331298828125,
+        "y": 865.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c1076b8e.81d988"
+                "71154b9b.41ff14"
             ]
         ]
     },
     {
-        "id": "13815c78.95eb5c",
+        "id": "1bbc50b7.a546f7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 459.0576171875,
-        "y": 934.5740356445312,
-        "z": "b25656d7.85a8a8",
+        "x": 508.82427978515625,
+        "y": 910.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e5780368.e11db",
+        "id": "46ec206d.bba02",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 456.566650390625,
-        "y": 978,
-        "z": "b25656d7.85a8a8",
+        "x": 506.33331298828125,
+        "y": 954.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "96cea788.4bc5b"
+                "d5a43e3e.bfb46"
             ]
         ]
     },
     {
-        "id": "96cea788.4bc5b",
+        "id": "d5a43e3e.bfb46",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 625.566650390625,
-        "y": 979,
-        "z": "b25656d7.85a8a8",
+        "x": 675.3333129882812,
+        "y": 955.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ec5bb05c.091188",
+        "id": "c36699ae.d9b4d8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 597.566650390625,
-        "y": 1473,
-        "z": "b25656d7.85a8a8",
+        "x": 647.3333129882812,
+        "y": 1449.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "19a0d254.b680d6"
+                "cf4994da.4e15f8"
             ]
         ]
     },
     {
-        "id": "19a0d254.b680d6",
+        "id": "cf4994da.4e15f8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 800.566650390625,
-        "y": 1485,
-        "z": "b25656d7.85a8a8",
+        "x": 850.3333129882812,
+        "y": 1461.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5cf33a37.92a98c"
+                "5493f71f.74de8"
             ]
         ]
     },
     {
-        "id": "5cf33a37.92a98c",
+        "id": "5493f71f.74de8",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 966.566650390625,
-        "y": 1482,
-        "z": "b25656d7.85a8a8",
+        "x": 1016.3333129882812,
+        "y": 1458.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "60d055a9.95f0c4"
+                "ee9f0ecc.141c08"
             ]
         ]
     },
     {
-        "id": "60d055a9.95f0c4",
+        "id": "ee9f0ecc.141c08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1127.566650390625,
-        "y": 1479,
-        "z": "b25656d7.85a8a8",
+        "x": 1177.3333129882812,
+        "y": 1455.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "325c2337.f5bbac",
-                "282c70ac.7ebb8",
-                "790547b3.03e69",
-                "be332a4a.d8db58",
-                "88b6396e.dee88",
-                "3f4654a9.b7d9fc"
+                "4557d328.03c724",
+                "aa5d4b55.ae996",
+                "977d1c3.25b4f6",
+                "f4df7601.a8481",
+                "e57dfa3b.7a1478",
+                "7a26c91d.a51bf"
             ]
         ]
     },
     {
-        "id": "282c70ac.7ebb8",
+        "id": "aa5d4b55.ae996",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1333.566650390625,
-        "y": 1078.9999389648438,
-        "z": "b25656d7.85a8a8",
+        "x": 1383.3333129882812,
+        "y": 1054.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "325c2337.f5bbac",
+        "id": "4557d328.03c724",
         "type": "save",
         "name": "get uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1330.566650390625,
-        "y": 1123.9999389648438,
-        "z": "b25656d7.85a8a8",
+        "x": 1380.3333129882812,
+        "y": 1099.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5ebf3dd3.403df4",
-                "df8620f2.fcde78",
-                "4f82abb0.8dd704"
+                "93fcd434.d90c9",
+                "74ecef95.a69828",
+                "c24f7a8a.a1ade"
             ]
         ]
     },
     {
-        "id": "df8620f2.fcde78",
+        "id": "74ecef95.a69828",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1526.0576171875,
-        "y": 1097.5739135742188,
-        "z": "b25656d7.85a8a8",
+        "x": 1575.8242797851562,
+        "y": 1073.5739212036133,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f317bbdf.6454e"
+                "ae28b8c.fba5c48"
             ]
         ]
     },
     {
-        "id": "4f82abb0.8dd704",
+        "id": "c24f7a8a.a1ade",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.566650390625,
-        "y": 1141.9998779296875,
-        "z": "b25656d7.85a8a8",
+        "x": 1571.3333129882812,
+        "y": 1117.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ba985891.b5d178"
+                "90024c2d.8db9e"
             ]
         ]
     },
     {
-        "id": "f317bbdf.6454e",
+        "id": "ae28b8c.fba5c48",
         "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": 1688.629150390625,
-        "y": 1096.859619140625,
-        "z": "b25656d7.85a8a8",
+        "x": 1738.3958129882812,
+        "y": 1072.8596267700195,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ba985891.b5d178",
+        "id": "90024c2d.8db9e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1689.566650390625,
-        "y": 1141.9998779296875,
-        "z": "b25656d7.85a8a8",
+        "x": 1739.3333129882812,
+        "y": 1117.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d594aca6.9a4aa",
+        "id": "3a69019e.e0465e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1691.566650390625,
-        "y": 1188.9998779296875,
-        "z": "b25656d7.85a8a8",
+        "x": 1741.3333129882812,
+        "y": 1164.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5ebf3dd3.403df4",
+        "id": "93fcd434.d90c9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1522.566650390625,
-        "y": 1188.9998779296875,
-        "z": "b25656d7.85a8a8",
+        "x": 1572.3333129882812,
+        "y": 1164.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d594aca6.9a4aa"
+                "3a69019e.e0465e"
             ]
         ]
     },
     {
-        "id": "f22d69be.3697f8",
+        "id": "87587932.9e7dd",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 1304.566650390625,
-        "y": 1710,
-        "z": "b25656d7.85a8a8",
+        "x": 1354.3333129882812,
+        "y": 1686.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "790547b3.03e69",
+        "id": "977d1c3.25b4f6",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
-        "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
+        "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<!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1395.566650390625,
-        "y": 1764,
-        "z": "b25656d7.85a8a8",
+        "x": 1445.3333129882812,
+        "y": 1740.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a6f0acc2.4c1e8",
+        "id": "1a612904.ca3407",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2072.066650390625,
-        "y": 1177,
-        "z": "b25656d7.85a8a8",
+        "x": 2121.8333129882812,
+        "y": 1153.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ff492e23.69ead8",
+        "id": "70124697.bdc348",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2077.066650390625,
-        "y": 1279,
-        "z": "b25656d7.85a8a8",
+        "x": 2126.8333129882812,
+        "y": 1255.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f2cd3854.ada88",
+        "id": "d56221fe.c2bbf",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 560.566650390625,
-        "y": 1729,
-        "z": "b25656d7.85a8a8",
+        "x": 610.3333129882812,
+        "y": 1705.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6040df7.067df2"
+                "aeacc57e.1c70e"
             ]
         ]
     },
     {
-        "id": "6040df7.067df2",
+        "id": "aeacc57e.1c70e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 792.566650390625,
-        "y": 1728,
-        "z": "b25656d7.85a8a8",
+        "x": 842.3333129882812,
+        "y": 1704.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f4813036.0e422"
+                "dab1af90.85d2c"
             ]
         ]
     },
     {
-        "id": "f4813036.0e422",
+        "id": "dab1af90.85d2c",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1004.566650390625,
-        "y": 1729,
-        "z": "b25656d7.85a8a8",
+        "x": 1054.3333129882812,
+        "y": 1705.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "21d7816d.cb9a2e"
+                "6cc09a7e.3eecf4"
             ]
         ]
     },
     {
-        "id": "21d7816d.cb9a2e",
+        "id": "6cc09a7e.3eecf4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 260.566650390625,
-        "y": 1885,
-        "z": "b25656d7.85a8a8",
+        "x": 310.33331298828125,
+        "y": 1861.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "99bd9d6a.34096",
-                "25dea7fd.0f37b"
+                "acf145f8.65836",
+                "d6c02212.5df71"
             ]
         ]
     },
     {
-        "id": "25dea7fd.0f37b",
+        "id": "d6c02212.5df71",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 495.566650390625,
-        "y": 1872,
-        "z": "b25656d7.85a8a8",
+        "x": 545.3333129882812,
+        "y": 1848.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "99bd9d6a.34096",
+        "id": "acf145f8.65836",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 485.566650390625,
-        "y": 1933,
-        "z": "b25656d7.85a8a8",
+        "x": 535.3333129882812,
+        "y": 1909.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "74a706a.d47d878",
-                "7274c8e3.f8fec8",
-                "b6208f6.4c1eb7"
+                "87fb6e74.97fee8",
+                "cc7c3629.07cd7",
+                "419399de.ad60b8"
             ]
         ]
     },
     {
-        "id": "7274c8e3.f8fec8",
+        "id": "cc7c3629.07cd7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 699.0576171875,
-        "y": 1917.5740356445312,
-        "z": "b25656d7.85a8a8",
+        "x": 748.8242797851562,
+        "y": 1893.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7f886391.998a1c"
+                "739447c7.2df608"
             ]
         ]
     },
     {
-        "id": "b6208f6.4c1eb7",
+        "id": "419399de.ad60b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 694.566650390625,
-        "y": 1962,
-        "z": "b25656d7.85a8a8",
+        "x": 744.3333129882812,
+        "y": 1938.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3f233556.698682"
+                "a817deb7.6d09d"
             ]
         ]
     },
     {
-        "id": "74a706a.d47d878",
+        "id": "87fb6e74.97fee8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 696.566650390625,
-        "y": 2022,
-        "z": "b25656d7.85a8a8",
+        "x": 746.3333129882812,
+        "y": 1998.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "721ed34e.4f1714"
+                "40dff6fa.ed3558"
             ]
         ]
     },
     {
-        "id": "7f886391.998a1c",
+        "id": "739447c7.2df608",
         "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": 861.629150390625,
-        "y": 1916.8597412109375,
-        "z": "b25656d7.85a8a8",
+        "x": 911.3958129882812,
+        "y": 1892.859748840332,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "3f233556.698682",
+        "id": "a817deb7.6d09d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 862.566650390625,
-        "y": 1962,
-        "z": "b25656d7.85a8a8",
+        "x": 912.3333129882812,
+        "y": 1938.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "721ed34e.4f1714",
+        "id": "40dff6fa.ed3558",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 865.566650390625,
-        "y": 2021,
-        "z": "b25656d7.85a8a8",
+        "x": 915.3333129882812,
+        "y": 1997.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fb6c612a.831f28",
-                "af0310e2.931fe8"
+                "e2deabd9.c69c8",
+                "574db0eb.1dd5f"
             ]
         ]
     },
     {
-        "id": "a05b5003.46c7e8",
+        "id": "bcc45625.ebbc48",
         "type": "set",
         "name": "set sotn_value",
-        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
         "comments": "",
-        "x": 285.566650390625,
-        "y": 2523,
-        "z": "b25656d7.85a8a8",
+        "x": 335.33331298828125,
+        "y": 2499.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c5885881.921d18",
+        "id": "fa8a8b3f.f0a5f8",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 407.566650390625,
-        "y": 2580,
-        "z": "b25656d7.85a8a8",
+        "x": 457.33331298828125,
+        "y": 2556.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1736d2be.a7f385",
-                "11bf3fb5.747c4"
+                "2e9bd62d.c02afa",
+                "55c19c27.0b4a64"
             ]
         ]
     },
     {
-        "id": "1736d2be.a7f385",
+        "id": "2e9bd62d.c02afa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 720.066650390625,
-        "y": 2557,
-        "z": "b25656d7.85a8a8",
+        "x": 769.8333129882812,
+        "y": 2533.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "11bf3fb5.747c4",
+        "id": "55c19c27.0b4a64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 724.066650390625,
-        "y": 2597,
-        "z": "b25656d7.85a8a8",
+        "x": 773.8333129882812,
+        "y": 2573.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9fa6731e.bfdda"
+                "19a8d296.6252e5"
             ]
         ]
     },
     {
-        "id": "d975bee8.cbb1b8",
+        "id": "81214b8b.cb073",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 900.066650390625,
-        "y": 2561,
-        "z": "b25656d7.85a8a8",
+        "x": 949.8333129882812,
+        "y": 2537.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9fa6731e.bfdda",
+        "id": "19a8d296.6252e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 915.566650390625,
-        "y": 2615,
-        "z": "b25656d7.85a8a8",
+        "x": 965.3333129882812,
+        "y": 2591.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "26102eb4.5bf9d2",
-                "a5cf86e7.fd2ae8",
-                "94107493.94d3e8",
-                "c85f3994.bd81f"
+                "89591cea.6097a8",
+                "e0a0a9f7.c3b968",
+                "39281a09.347b8e",
+                "8394d0d1.93103"
             ]
         ]
     },
     {
-        "id": "3a7c38a3.d1311",
+        "id": "d3d37efd.5c6f1",
         "type": "save",
         "name": "update vpn-binding resource (aka. OTN ) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1211.066650390625,
-        "y": 2584,
-        "z": "b25656d7.85a8a8",
+        "x": 1260.8333129882812,
+        "y": 2560.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5ebfe0.284f7",
+        "id": "e1720f9a.264c28",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 2678.066650390625,
-        "y": 1935,
-        "z": "b25656d7.85a8a8",
+        "x": 2727.8333129882812,
+        "y": 1911.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "26102eb4.5bf9d2",
+        "id": "89591cea.6097a8",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1173.066650390625,
-        "y": 2626,
-        "z": "b25656d7.85a8a8",
+        "x": 1222.8333129882812,
+        "y": 2602.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "eaf51112.30b59",
+        "id": "7128141a.22afcc",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 2038.066650390625,
-        "y": 1215,
-        "z": "b25656d7.85a8a8",
+        "x": 2087.8333129882812,
+        "y": 1191.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "77e27285.394bfc",
+        "id": "59bf9e6a.8c5448",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 2039.066650390625,
-        "y": 1319,
-        "z": "b25656d7.85a8a8",
+        "x": 2088.8333129882812,
+        "y": 1295.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1771c9d3.36c546",
+        "id": "d2ff3c56.4372d",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4332.566650390625,
-        "y": 576,
-        "z": "b25656d7.85a8a8",
+        "x": 4382.333312988281,
+        "y": 552.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6270f9ff.6a6b4",
+        "id": "8c5d7664.9247c8",
         "type": "save",
         "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4235.566650390625,
-        "y": 1395,
-        "z": "b25656d7.85a8a8",
+        "x": 4285.333312988281,
+        "y": 1371.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2308c235.08d20e",
+        "id": "cedd744c.d4173",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3729.566650390625,
-        "y": 2067,
-        "z": "b25656d7.85a8a8",
+        "x": 3779.3333129882812,
+        "y": 2043.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c1076b8e.81d988",
+        "id": "71154b9b.41ff14",
         "type": "switchNode",
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 830.566650390625,
-        "y": 875,
-        "z": "b25656d7.85a8a8",
+        "x": 880.3333129882812,
+        "y": 851.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "451a757.6fc508c",
-                "8b0542af.2f9d78"
+                "549c1dfb.8f3224",
+                "34cb7bd3.43733c"
             ]
         ]
     },
     {
-        "id": "451a757.6fc508c",
+        "id": "549c1dfb.8f3224",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1193.566650390625,
-        "y": 898,
-        "z": "b25656d7.85a8a8",
+        "x": 1243.3333129882812,
+        "y": 874.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f1ea0737.b79178"
+                "e217a5f3.43edf8"
             ]
         ]
     },
     {
-        "id": "8b0542af.2f9d78",
+        "id": "34cb7bd3.43733c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1193.566650390625,
-        "y": 847,
-        "z": "b25656d7.85a8a8",
+        "x": 1243.3333129882812,
+        "y": 823.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3e6bbe33.acc602"
+                "845a9945.5ecef8"
             ]
         ]
     },
     {
-        "id": "f1ea0737.b79178",
+        "id": "e217a5f3.43edf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1349.566650390625,
-        "y": 896,
-        "z": "b25656d7.85a8a8",
+        "x": 1399.3333129882812,
+        "y": 872.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "cb3a4052.881008"
+                "462f3353.3aa76c"
             ]
         ]
     },
     {
-        "id": "3e6bbe33.acc602",
+        "id": "845a9945.5ecef8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1326.566650390625,
-        "y": 848,
-        "z": "b25656d7.85a8a8",
+        "x": 1376.3333129882812,
+        "y": 824.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b01d3963.8ea8b8",
+        "id": "a8591f2d.71e23",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2086.566650390625,
-        "y": 246,
-        "z": "b25656d7.85a8a8",
+        "x": 2136.3333129882812,
+        "y": 222.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5a0cb184.9cdf98",
+        "id": "c2c48b41.449c5",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3628.566650390625,
-        "y": 2227,
-        "z": "b25656d7.85a8a8",
+        "x": 3678.3333129882812,
+        "y": 2203.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d9cf64bd.4ed12",
+        "id": "9499a947.255148",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4218.566650390625,
-        "y": 700,
-        "z": "b25656d7.85a8a8",
+        "x": 4268.333312988281,
+        "y": 676.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "be332a4a.d8db58",
+        "id": "f4df7601.a8481",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1392.566650390625,
-        "y": 1806,
-        "z": "b25656d7.85a8a8",
+        "x": 1442.3333129882812,
+        "y": 1782.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "3501da3.a014526",
+        "id": "c236e813.0b75c",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 571.566650390625,
-        "y": 1540,
-        "z": "b25656d7.85a8a8",
+        "x": 621.3333129882812,
+        "y": 1516.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2c2649c2.53ac7e",
+        "id": "ccf5136c.426918",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 602.566650390625,
-        "y": 1580,
-        "z": "b25656d7.85a8a8",
+        "x": 652.3333129882812,
+        "y": 1556.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "fb6c612a.831f28",
+        "id": "e2deabd9.c69c8",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1150.566650390625,
-        "y": 1988,
-        "z": "b25656d7.85a8a8",
+        "x": 1200.3333129882812,
+        "y": 1964.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "af0310e2.931fe8",
+        "id": "574db0eb.1dd5f",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1153.566650390625,
-        "y": 2030,
-        "z": "b25656d7.85a8a8",
+        "x": 1203.3333129882812,
+        "y": 2006.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "694d6c2f.8edccc",
+        "id": "67d19d91.7e0464",
         "type": "set",
         "name": "unset otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",
         "comments": "",
-        "x": 596.566650390625,
-        "y": 1670,
-        "z": "b25656d7.85a8a8",
+        "x": 646.3333129882812,
+        "y": 1646.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "4b32fbef.652bc4",
+        "id": "6dec5e05.6defc8",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 351.566650390625,
-        "y": 2049,
-        "z": "b25656d7.85a8a8",
+        "x": 401.33331298828125,
+        "y": 2025.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "caa8a64f.1936",
+        "id": "4d2f3635.de76f",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 359.566650390625,
-        "y": 2106,
-        "z": "b25656d7.85a8a8",
+        "x": 409.33331298828125,
+        "y": 2082.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "88b6396e.dee88",
+        "id": "e57dfa3b.7a1478",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1370.566650390625,
-        "y": 1655,
-        "z": "b25656d7.85a8a8",
+        "x": 1420.3333129882812,
+        "y": 1631.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "45e3fdbe.201574",
-                "86940004.bfdd7"
+                "42d55673.4b259",
+                "c68b8996.7afed8"
             ]
         ]
     },
     {
-        "id": "86940004.bfdd7",
+        "id": "c68b8996.7afed8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1593.566650390625,
-        "y": 1610,
-        "z": "b25656d7.85a8a8",
+        "x": 1643.3333129882812,
+        "y": 1586.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c31b8cce.808f08"
+                "30a6d609.f0af22"
             ]
         ]
     },
     {
-        "id": "45e3fdbe.201574",
+        "id": "42d55673.4b259",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1595.566650390625,
-        "y": 1674,
-        "z": "b25656d7.85a8a8",
+        "x": 1645.3333129882812,
+        "y": 1650.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1cc861e4.834c36"
+                "36f16c60.30df3c"
             ]
         ]
     },
     {
-        "id": "c31b8cce.808f08",
+        "id": "30a6d609.f0af22",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1758.566650390625,
-        "y": 1607,
-        "z": "b25656d7.85a8a8",
+        "x": 1808.3333129882812,
+        "y": 1583.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b2423aca.7a4fa8"
+                "33a6db5.6665724"
             ]
         ]
     },
     {
-        "id": "1cc861e4.834c36",
+        "id": "36f16c60.30df3c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 1757.566650390625,
-        "y": 1670,
-        "z": "b25656d7.85a8a8",
+        "x": 1807.3333129882812,
+        "y": 1646.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b2423aca.7a4fa8",
+        "id": "33a6db5.6665724",
         "type": "set",
         "name": "set tmp.uni-node-id-short",
         "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",
         "comments": "",
-        "x": 1978.566650390625,
-        "y": 1621,
-        "z": "b25656d7.85a8a8",
+        "x": 2028.3333129882812,
+        "y": 1597.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "45f30159.842648",
+        "id": "9a45a6ac.6bb008",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1523.566650390625,
-        "y": 2346,
-        "z": "b25656d7.85a8a8",
+        "x": 1573.3333129882812,
+        "y": 2322.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "195465ca.996e92"
+                "90552bad.c118e"
             ]
         ]
     },
     {
-        "id": "ac9df433.f2c8",
+        "id": "746f3218.6a2f4c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 1908.566650390625,
-        "y": 2359,
-        "z": "b25656d7.85a8a8",
+        "x": 1958.3333129882812,
+        "y": 2335.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "565cac1f.04fa64",
-                "e43b7ac1.fcb9e",
-                "7ad49b0d.e0614c"
+                "cc717bee.327628",
+                "4215d2eb.6b41b4",
+                "6de2353d.61ff6c"
             ]
         ]
     },
     {
-        "id": "195465ca.996e92",
+        "id": "90552bad.c118e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1702.566650390625,
-        "y": 2346,
-        "z": "b25656d7.85a8a8",
+        "x": 1752.3333129882812,
+        "y": 2322.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "94dbb559.adb488",
-                "ac9df433.f2c8"
+                "f2b28f1.371b57",
+                "746f3218.6a2f4c"
             ]
         ]
     },
     {
-        "id": "94dbb559.adb488",
+        "id": "f2b28f1.371b57",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainConn id",
         "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 1938.566650390625,
-        "y": 2307,
-        "z": "b25656d7.85a8a8",
+        "x": 1988.3333129882812,
+        "y": 2283.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "565cac1f.04fa64",
+        "id": "cc717bee.327628",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2118.566650390625,
-        "y": 2350,
-        "z": "b25656d7.85a8a8",
+        "x": 2168.3333129882812,
+        "y": 2326.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b1dc084c.7cde9"
+                "864e3f3b.37515"
             ]
         ]
     },
     {
-        "id": "e43b7ac1.fcb9e",
+        "id": "4215d2eb.6b41b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2110.566650390625,
-        "y": 2405,
-        "z": "b25656d7.85a8a8",
+        "x": 2160.3333129882812,
+        "y": 2381.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "385c483c.3ef568"
+                "dbafb74f.d2c48"
             ]
         ]
     },
     {
-        "id": "7ad49b0d.e0614c",
+        "id": "6de2353d.61ff6c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2115.566650390625,
-        "y": 2462,
-        "z": "b25656d7.85a8a8",
+        "x": 2165.3333129882812,
+        "y": 2438.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "35f4b5a3.f8aa4a"
+                "d9191b0b.ddee58"
             ]
         ]
     },
     {
-        "id": "35f4b5a3.f8aa4a",
+        "id": "d9191b0b.ddee58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2267.566650390625,
-        "y": 2463,
-        "z": "b25656d7.85a8a8",
+        "x": 2317.3333129882812,
+        "y": 2439.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "385c483c.3ef568",
+        "id": "dbafb74f.d2c48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2278.566650390625,
-        "y": 2408,
-        "z": "b25656d7.85a8a8",
+        "x": 2328.3333129882812,
+        "y": 2384.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b1dc084c.7cde9",
+        "id": "864e3f3b.37515",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2262.948974609375,
-        "y": 2347.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 2312.7156372070312,
+        "y": 2323.65567779541,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5d32a434.f7be54"
+                "f35ba5bd.48a6c8"
             ]
         ]
     },
     {
-        "id": "5d32a434.f7be54",
+        "id": "f35ba5bd.48a6c8",
         "type": "set",
         "name": "set controller domainConn data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 2477.566650390625,
-        "y": 2344,
-        "z": "b25656d7.85a8a8",
+        "x": 2527.3333129882812,
+        "y": 2320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "51bc490a.0719c",
+        "id": "8481025.43fb9",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 601.566650390625,
-        "y": 2392,
-        "z": "b25656d7.85a8a8",
+        "x": 651.3333129882812,
+        "y": 2368.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9a98fb41.58116",
-                "d11dcfed.810438",
-                "f803d5ab.85238"
+                "372d54fa.9f96f4",
+                "9dc1c4cc.c7a94",
+                "2d38b1b0.a69f26"
             ]
         ]
     },
     {
-        "id": "9a98fb41.58116",
+        "id": "372d54fa.9f96f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 797.0667724609375,
-        "y": 2344,
-        "z": "b25656d7.85a8a8",
+        "x": 846.8334350585938,
+        "y": 2320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "98bce7a3.da5e"
+                "eb66892d.1f2808"
             ]
         ]
     },
     {
-        "id": "d11dcfed.810438",
+        "id": "9dc1c4cc.c7a94",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 789.0667724609375,
-        "y": 2399,
-        "z": "b25656d7.85a8a8",
+        "x": 838.8334350585938,
+        "y": 2375.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "71f2762f.659628"
+                "79e4473c.6cea88"
             ]
         ]
     },
     {
-        "id": "98bce7a3.da5e",
+        "id": "eb66892d.1f2808",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 941.4490966796875,
-        "y": 2343.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 991.2157592773438,
+        "y": 2319.65567779541,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c67046c0.c64788"
+                "a488eeff.b05b28"
             ]
         ]
     },
     {
-        "id": "c67046c0.c64788",
+        "id": "a488eeff.b05b28",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1125.566650390625,
-        "y": 2342,
-        "z": "b25656d7.85a8a8",
+        "x": 1175.3333129882812,
+        "y": 2318.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5f0a1eb2.b2273"
+                "52486109.89e3d"
             ]
         ]
     },
     {
-        "id": "5f0a1eb2.b2273",
+        "id": "52486109.89e3d",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1320.566650390625,
-        "y": 2342,
-        "z": "b25656d7.85a8a8",
+        "x": 1370.3333129882812,
+        "y": 2318.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "45f30159.842648"
+                "9a45a6ac.6bb008"
             ]
         ]
     },
     {
-        "id": "f803d5ab.85238",
+        "id": "2d38b1b0.a69f26",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 794.0667724609375,
-        "y": 2456,
-        "z": "b25656d7.85a8a8",
+        "x": 843.8334350585938,
+        "y": 2432.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "33262ba5.8d682c"
+                "7ec62576.a9581c"
             ]
         ]
     },
     {
-        "id": "33262ba5.8d682c",
+        "id": "7ec62576.a9581c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 946.0667724609375,
-        "y": 2457,
-        "z": "b25656d7.85a8a8",
+        "x": 995.8334350585938,
+        "y": 2433.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "71f2762f.659628",
+        "id": "79e4473c.6cea88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 957.0667724609375,
-        "y": 2400,
-        "z": "b25656d7.85a8a8",
+        "x": 1006.8334350585938,
+        "y": 2376.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "808535b.d0bfd48",
+        "id": "46b10267.ea0e94",
         "type": "set",
         "name": "set tmp.pnf-name-forUrl",
         "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 591.566650390625,
-        "y": 2304,
-        "z": "b25656d7.85a8a8",
+        "x": 641.3333129882812,
+        "y": 2280.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "6e3ab27b.a7f37c",
+        "id": "9e415421.d3d5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 336.566650390625,
-        "y": 2435,
-        "z": "b25656d7.85a8a8",
+        "x": 386.33331298828125,
+        "y": 2411.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "808535b.d0bfd48",
-                "51bc490a.0719c"
+                "46b10267.ea0e94",
+                "8481025.43fb9"
             ]
         ]
     },
     {
-        "id": "dc357fe5.d2f6d8",
+        "id": "e5923dd1.06f5c",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1551.5333251953125,
-        "y": 252.88333129882812,
-        "z": "b25656d7.85a8a8",
+        "x": 1601.2999877929688,
+        "y": 228.88333892822266,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a92b97b8.4129e8",
+        "id": "57052eb0.583298",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 753.566650390625,
-        "y": 475,
-        "z": "b25656d7.85a8a8",
+        "x": 803.3333129882812,
+        "y": 451.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "baa368e2.d0057",
+        "id": "b87c2610.4dcfe8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 313.066650390625,
-        "y": 1444,
-        "z": "b25656d7.85a8a8",
+        "x": 362.83331298828125,
+        "y": 1420.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ec5bb05c.091188",
-                "f2cd3854.ada88",
-                "3501da3.a014526",
-                "2c2649c2.53ac7e",
-                "a05b5003.46c7e8",
-                "c5885881.921d18",
-                "694d6c2f.8edccc",
-                "4b32fbef.652bc4",
-                "caa8a64f.1936",
-                "6e3ab27b.a7f37c",
-                "5a72a2f9.fe54bc"
+                "c36699ae.d9b4d8",
+                "d56221fe.c2bbf",
+                "c236e813.0b75c",
+                "ccf5136c.426918",
+                "bcc45625.ebbc48",
+                "fa8a8b3f.f0a5f8",
+                "67d19d91.7e0464",
+                "6dec5e05.6defc8",
+                "4d2f3635.de76f",
+                "9e415421.d3d5",
+                "4fcc44c7.7479d4"
             ]
         ]
     },
     {
-        "id": "3f4654a9.b7d9fc",
+        "id": "7a26c91d.a51bf",
         "type": "switchNode",
         "name": "switch uni type",
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1343.566650390625,
-        "y": 1282,
-        "z": "b25656d7.85a8a8",
+        "x": 1393.3333129882812,
+        "y": 1258.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "118223c9.ee1e8c",
-                "5e72886e.16b82",
-                "9ad14e96.a683a8",
-                "b20e668c.49e0a"
+                "a9279133.62197",
+                "c4ef1cec.86081",
+                "5303ba0b.725dcc",
+                "84ee69ca.e736d8"
             ]
         ]
     },
     {
-        "id": "118223c9.ee1e8c",
+        "id": "a9279133.62197",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1508.566650390625,
-        "y": 1264,
-        "z": "b25656d7.85a8a8",
+        "x": 1558.3333129882812,
+        "y": 1240.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4829f132.924c9"
+                "df04fed1.2e9e3"
             ]
         ]
     },
     {
-        "id": "5e72886e.16b82",
+        "id": "c4ef1cec.86081",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1511.566650390625,
-        "y": 1303,
-        "z": "b25656d7.85a8a8",
+        "x": 1561.3333129882812,
+        "y": 1279.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1b6bbf84.2b9b8"
+                "1437703.dec509"
             ]
         ]
     },
     {
-        "id": "b20e668c.49e0a",
+        "id": "84ee69ca.e736d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1505.566650390625,
-        "y": 1381,
-        "z": "b25656d7.85a8a8",
+        "x": 1555.3333129882812,
+        "y": 1357.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "23f70279.3c530e"
+                "c52f2275.ca0538"
             ]
         ]
     },
     {
-        "id": "9ad14e96.a683a8",
+        "id": "5303ba0b.725dcc",
         "type": "outcome",
         "name": "root-secondary",
         "xml": "<outcome value='root-secondary'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1528.566650390625,
-        "y": 1344,
-        "z": "b25656d7.85a8a8",
+        "x": 1578.3333129882812,
+        "y": 1320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "690a7c3c.e28bc4"
+                "bb188e14.1d1858"
             ]
         ]
     },
     {
-        "id": "34596fcc.944e58",
+        "id": "f4fe23e8.e2bba",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2074.566650390625,
-        "y": 1377,
-        "z": "b25656d7.85a8a8",
+        "x": 2124.3333129882812,
+        "y": 1353.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "36c4b896.3cd558",
+        "id": "a68d577a.75b008",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
         "comments": "",
-        "x": 2036.566650390625,
-        "y": 1417,
-        "z": "b25656d7.85a8a8",
+        "x": 2086.3333129882812,
+        "y": 1393.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "23f70279.3c530e",
+        "id": "c52f2275.ca0538",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1657.566650390625,
-        "y": 1402,
-        "z": "b25656d7.85a8a8",
+        "x": 1707.3333129882812,
+        "y": 1378.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5cf86e7.fd2ae8",
+        "id": "e0a0a9f7.c3b968",
         "type": "execute",
         "name": "execute RestApiCallNode Create Performance Monitoring Data",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1247.1500244140625,
-        "y": 2701.3336181640625,
-        "z": "b25656d7.85a8a8",
+        "x": 1296.9166870117188,
+        "y": 2677.333625793457,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4829f132.924c9",
+        "id": "df04fed1.2e9e3",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1643.4832763671875,
-        "y": 1260.333251953125,
-        "z": "b25656d7.85a8a8",
+        "x": 1693.2499389648438,
+        "y": 1236.3332595825195,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "eaf51112.30b59"
+                "7128141a.22afcc"
             ]
         ]
     },
     {
-        "id": "1b6bbf84.2b9b8",
+        "id": "1437703.dec509",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1645.4832763671875,
-        "y": 1298.333251953125,
-        "z": "b25656d7.85a8a8",
+        "x": 1695.2499389648438,
+        "y": 1274.3332595825195,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "77e27285.394bfc"
+                "59bf9e6a.8c5448"
             ]
         ]
     },
     {
-        "id": "690a7c3c.e28bc4",
+        "id": "bb188e14.1d1858",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1688.4832763671875,
-        "y": 1345.333251953125,
-        "z": "b25656d7.85a8a8",
+        "x": 1738.2499389648438,
+        "y": 1321.3332595825195,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "36c4b896.3cd558"
+                "a68d577a.75b008"
             ]
         ]
     },
     {
-        "id": "94107493.94d3e8",
+        "id": "39281a09.347b8e",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishSubscription",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1215.1500244140625,
-        "y": 2773.33349609375,
-        "z": "b25656d7.85a8a8",
+        "x": 1264.9166870117188,
+        "y": 2749.3335037231445,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c85f3994.bd81f",
+        "id": "8394d0d1.93103",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishPersistentConnection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1245.1500244140625,
-        "y": 2835.33349609375,
-        "z": "b25656d7.85a8a8",
+        "x": 1294.9166870117188,
+        "y": 2811.3335037231445,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a72a2f9.fe54bc",
+        "id": "4fcc44c7.7479d4",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 638.566650390625,
-        "y": 1382.166748046875,
-        "z": "b25656d7.85a8a8",
+        "x": 688.3333129882812,
+        "y": 1358.1667556762695,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "cb3a4052.881008",
+        "id": "462f3353.3aa76c",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 179.56666564941406,
-        "y": 1093.1666259765625,
-        "z": "b25656d7.85a8a8",
+        "x": 229.3333282470703,
+        "y": 1069.166633605957,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f5718cb9.775688",
-                "eaa991b9.45489"
+                "66788e31.cd8e5",
+                "15c226b1.2f2f21"
             ]
         ]
     },
     {
-        "id": "eaa991b9.45489",
+        "id": "15c226b1.2f2f21",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 364.566650390625,
-        "y": 1267.1666259765625,
-        "z": "b25656d7.85a8a8",
+        "x": 414.33331298828125,
+        "y": 1243.166633605957,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "baa368e2.d0057"
+                "b87c2610.4dcfe8"
             ]
         ]
     },
     {
-        "id": "f5718cb9.775688",
+        "id": "66788e31.cd8e5",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 367.566650390625,
-        "y": 1222.1666259765625,
-        "z": "b25656d7.85a8a8",
+        "x": 417.33331298828125,
+        "y": 1198.166633605957,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "baa368e2.d0057"
+                "b87c2610.4dcfe8"
             ]
         ]
     }
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 5989c10f..f834a973 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "77a1d01c.aa0f88",
+    "id": "760c3032.024ec8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 168.56666564941406,
-    "y": 174.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 176.56666564941406,
+    "y": 129.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1e3c1648.671ee2"
+        "5c65c97e.4fcce"
       ]
     ]
   },
   {
-    "id": "1e3c1648.671ee2",
+    "id": "5c65c97e.4fcce",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7886 +22,7886 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 452.85235595703125,
-    "y": 235.8047742843628,
-    "z": "294b5e8a.041612",
+    "x": 460.85235595703125,
+    "y": 190.8047742843628,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cf91a24a.cfe63"
+        "f52e4a2.8e9b7b8"
       ]
     ]
   },
   {
-    "id": "cf91a24a.cfe63",
+    "id": "f52e4a2.8e9b7b8",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-create-clean",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 458.9952697753906,
-    "y": 320.5666961669922,
-    "z": "294b5e8a.041612",
+    "x": 466.9952697753906,
+    "y": 275.5666961669922,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8dc5a038.179a08"
+        "f52145b6.00f26"
       ]
     ]
   },
   {
-    "id": "8dc5a038.179a08",
+    "id": "f52145b6.00f26",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 808.5666656494141,
-    "y": 379.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 816.5666656494141,
+    "y": 334.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9b12be39.ac6768",
-        "27bb57a4.5f987",
-        "2a2da752.b59748"
+        "b781570d.1bdc6",
+        "a3b9d436.7cd37",
+        "916ad2e4.da3bd"
       ]
     ]
   },
   {
-    "id": "9b12be39.ac6768",
+    "id": "b781570d.1bdc6",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 1109.900161743164,
-    "y": 650.4969635009766,
-    "z": "294b5e8a.041612",
+    "x": 1117.900161743164,
+    "y": 605.4969635009766,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "27bb57a4.5f987",
+    "id": "a3b9d436.7cd37",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
     "comments": "",
     "outputs": 1,
-    "x": 1131.328628540039,
-    "y": 352.8999786376953,
-    "z": "294b5e8a.041612",
+    "x": 1139.328628540039,
+    "y": 307.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6a4d10dc.68d4a",
-        "5691a128.aafbf8",
-        "5af1bedf.a7a338"
+        "a44b76d8.232f78",
+        "2fc87770.5a98b8",
+        "d48f40d3.37656"
       ]
     ]
   },
   {
-    "id": "6a4d10dc.68d4a",
+    "id": "a44b76d8.232f78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1356.328628540039,
-    "y": 210.8999786376953,
-    "z": "294b5e8a.041612",
+    "x": 1364.328628540039,
+    "y": 165.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "80bca2fd.976568"
+        "a9f7ac5b.dc2e28"
       ]
     ]
   },
   {
-    "id": "5691a128.aafbf8",
+    "id": "2fc87770.5a98b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1351.819595336914,
-    "y": 280.47401428222656,
-    "z": "294b5e8a.041612",
+    "x": 1359.819595336914,
+    "y": 235.47401428222656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7f99fec5.4581e"
+        "87351fcb.5849e"
       ]
     ]
   },
   {
-    "id": "5af1bedf.a7a338",
+    "id": "d48f40d3.37656",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1340.328628540039,
-    "y": 326.8999786376953,
-    "z": "294b5e8a.041612",
+    "x": 1348.328628540039,
+    "y": 281.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "811c97ff.d24ba8"
+        "81b461.b8b3eba"
       ]
     ]
   },
   {
-    "id": "1663aedd.7a50f9",
+    "id": "ed4dfd16.f55a8",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1110.328628540039,
-    "y": 240.8999786376953,
-    "z": "294b5e8a.041612",
+    "x": 1118.328628540039,
+    "y": 195.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2a2da752.b59748",
+    "id": "916ad2e4.da3bd",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1098.328628540039,
-    "y": 292.8999786376953,
-    "z": "294b5e8a.041612",
+    "x": 1106.328628540039,
+    "y": 247.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "80bca2fd.976568",
+    "id": "a9f7ac5b.dc2e28",
     "type": "switchNode",
     "name": "switch allotted-resources_length != 0",
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1596.566665649414,
-    "y": 207.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 1604.566665649414,
+    "y": 162.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9eedb337.58df9",
-        "1db64f77.692391"
+        "9413aaeb.d092f",
+        "4243f2e3.377954"
       ]
     ]
   },
   {
-    "id": "7f99fec5.4581e",
+    "id": "87351fcb.5849e",
     "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": 1506.6290435791016,
-    "y": 283.4264373779297,
-    "z": "294b5e8a.041612",
+    "x": 1514.6290435791016,
+    "y": 238.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "811c97ff.d24ba8",
+    "id": "81b461.b8b3eba",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1510.566665649414,
-    "y": 327.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 1518.566665649414,
+    "y": 282.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9eedb337.58df9",
+    "id": "9413aaeb.d092f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1801.566665649414,
-    "y": 244.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 1809.566665649414,
+    "y": 199.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e3d32c54.b9a328"
+        "41ee935e.7af694"
       ]
     ]
   },
   {
-    "id": "1db64f77.692391",
+    "id": "4243f2e3.377954",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1811.566665649414,
-    "y": 171.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 1819.566665649414,
+    "y": 126.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e3d32c54.b9a328",
+    "id": "41ee935e.7af694",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1794.566665649414,
-    "y": 319.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 1802.566665649414,
+    "y": 274.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bb266e42.d64ce8",
-        "33816966.623666",
-        "6367b887.741ef",
-        "a5dc6d6.f390b9",
-        "c617e6ee.8b983"
+        "48c9f8b7.accfc",
+        "4b70868c.ca77",
+        "33568fb6.bac76",
+        "ed1c5832.299138",
+        "629500a0.f350c"
       ]
     ]
   },
   {
-    "id": "410f1f1c.a0bc8",
+    "id": "911385ff.dcfb6",
     "type": "save",
     "name": "get allotted-resource from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2280.566665649414,
-    "y": 370.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2288.566665649414,
+    "y": 325.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b15d3419.e56af8",
-        "8179030d.1dc9b8",
-        "c175e9c7.17a5f8"
+        "7bf84f8a.19dac",
+        "e93a24fd.89bb98",
+        "b3019feb.2307b"
       ]
     ]
   },
   {
-    "id": "b15d3419.e56af8",
+    "id": "7bf84f8a.19dac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2496.566665649414,
-    "y": 437.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2504.566665649414,
+    "y": 392.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e4dfd7bc.ebf1f8"
+        "28ff285d.675018"
       ]
     ]
   },
   {
-    "id": "8179030d.1dc9b8",
+    "id": "e93a24fd.89bb98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2497.057632446289,
-    "y": 337.14064025878906,
-    "z": "294b5e8a.041612",
+    "x": 2505.057632446289,
+    "y": 292.14064025878906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a4be790d.e1feb"
+        "4ef0e01e.f3cdf"
       ]
     ]
   },
   {
-    "id": "c175e9c7.17a5f8",
+    "id": "b3019feb.2307b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2492.566665649414,
-    "y": 386.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2500.566665649414,
+    "y": 341.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7226e4d.271f21c"
+        "2913a1dc.ae6786"
       ]
     ]
   },
   {
-    "id": "bb266e42.d64ce8",
+    "id": "48c9f8b7.accfc",
     "type": "for",
     "name": "for each allotted-resource",
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1997.566665649414,
-    "y": 351.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2005.566665649414,
+    "y": 306.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a610825f.3baab8",
-        "410f1f1c.a0bc8",
-        "5b668059.1f482",
-        "989a0e11.127538"
+        "8b66b4b0.d208d8",
+        "911385ff.dcfb6",
+        "79257077.5f1ff8",
+        "8a55fb57.dfc438"
       ]
     ]
   },
   {
-    "id": "a610825f.3baab8",
+    "id": "8b66b4b0.d208d8",
     "type": "set",
     "name": "set the current allotted-resource-id",
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
     "comments": "",
-    "x": 2277.566665649414,
-    "y": 289.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2285.566665649414,
+    "y": 244.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a5dc6d6.f390b9",
+    "id": "ed1c5832.299138",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
     "comments": "",
-    "x": 1971.566665649414,
-    "y": 301.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 1979.566665649414,
+    "y": 256.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "33816966.623666",
+    "id": "4b70868c.ca77",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2014.566665649414,
-    "y": 160.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2022.566665649414,
+    "y": 115.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6367b887.741ef",
+    "id": "33568fb6.bac76",
     "type": "get-resource",
     "name": "get-resource logical-links",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2026.566665649414,
-    "y": 201.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2034.566665649414,
+    "y": 156.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "bc72be6f.8dc5b",
+    "id": "2a477cee.98364c",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2051.566665649414,
-    "y": 113.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2059.566665649414,
+    "y": 68.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "999645ff.8d79f8",
+    "id": "11e969ea.04e966",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
     "comments": "",
-    "x": 1971.566665649414,
-    "y": 247.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 1979.566665649414,
+    "y": 202.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a4be790d.e1feb",
+    "id": "4ef0e01e.f3cdf",
     "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": 2675.566665649414,
-    "y": 339.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2683.566665649414,
+    "y": 294.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7226e4d.271f21c",
+    "id": "2913a1dc.ae6786",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2675.504165649414,
-    "y": 388.70692443847656,
-    "z": "294b5e8a.041612",
+    "x": 2683.504165649414,
+    "y": 343.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e4dfd7bc.ebf1f8",
+    "id": "28ff285d.675018",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2677.504165649414,
-    "y": 439.70692443847656,
-    "z": "294b5e8a.041612",
+    "x": 2685.504165649414,
+    "y": 394.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4971434.1d7e03c"
+        "ef99d74f.4057d"
       ]
     ]
   },
   {
-    "id": "4971434.1d7e03c",
+    "id": "ef99d74f.4057d",
     "type": "save",
     "name": "get allotted-resource relationship from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2970.504165649414,
-    "y": 386.70692443847656,
-    "z": "294b5e8a.041612",
+    "x": 2978.504165649414,
+    "y": 341.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "24e6d7c1.5d2048",
-        "3ed3e5cb.f1266a",
-        "c01f466a.2c59b8"
+        "e456d5f.a155828",
+        "7848fc63.19f06c",
+        "64a94fba.40e7a"
       ]
     ]
   },
   {
-    "id": "3ed3e5cb.f1266a",
+    "id": "7848fc63.19f06c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3273.995101928711,
-    "y": 119.28089904785156,
-    "z": "294b5e8a.041612",
+    "x": 3281.995101928711,
+    "y": 74.28089904785156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "23469507.c7cb02"
+        "afcd1c40.b768f"
       ]
     ]
   },
   {
-    "id": "23469507.c7cb02",
+    "id": "afcd1c40.b768f",
     "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": 3451.566635131836,
-    "y": 119.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 3459.566635131836,
+    "y": 74.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c01f466a.2c59b8",
+    "id": "64a94fba.40e7a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3269.504135131836,
-    "y": 168.70692443847656,
-    "z": "294b5e8a.041612",
+    "x": 3277.504135131836,
+    "y": 123.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "196361cf.857fbe"
+        "9649b9cd.238c78"
       ]
     ]
   },
   {
-    "id": "196361cf.857fbe",
+    "id": "9649b9cd.238c78",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3451.504135131836,
-    "y": 168.70692443847656,
-    "z": "294b5e8a.041612",
+    "x": 3459.504135131836,
+    "y": 123.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "24e6d7c1.5d2048",
+    "id": "e456d5f.a155828",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3273.504135131836,
-    "y": 219.70692443847656,
-    "z": "294b5e8a.041612",
+    "x": 3281.504135131836,
+    "y": 174.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "51b732b0.20c4ec"
+        "8fd753ef.f9f648"
       ]
     ]
   },
   {
-    "id": "51b732b0.20c4ec",
+    "id": "8fd753ef.f9f648",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3453.504135131836,
-    "y": 219.70692443847656,
-    "z": "294b5e8a.041612",
+    "x": 3461.504135131836,
+    "y": 174.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b7af5f8.780582"
+        "f37cd8dc.622f28"
       ]
     ]
   },
   {
-    "id": "b7af5f8.780582",
+    "id": "f37cd8dc.622f28",
     "type": "switchNode",
     "name": "switch allotted-resource.relationship-list not empty",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2989.566665649414,
-    "y": 514.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 2997.566665649414,
+    "y": 469.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "73dd535b.21de04",
-        "941bba5e.9658d"
+        "d8de60b.2b55ea",
+        "6b2e15a0.33589c"
       ]
     ]
   },
   {
-    "id": "941bba5e.9658d",
+    "id": "6b2e15a0.33589c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3329.566635131836,
-    "y": 361.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 3337.566635131836,
+    "y": 316.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "73dd535b.21de04",
+    "id": "d8de60b.2b55ea",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3328.566635131836,
-    "y": 415.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 3336.566635131836,
+    "y": 370.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "33242734.b6ef48"
+        "41425976.6167f8"
       ]
     ]
   },
   {
-    "id": "8e081bd8.979208",
+    "id": "d54e5594.aff43",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4073.566635131836,
-    "y": 369.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 4081.566635131836,
+    "y": 324.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ce0fbf14.8d016"
+        "20569ac4.3ebdd6"
       ]
     ]
   },
   {
-    "id": "ce0fbf14.8d016",
+    "id": "20569ac4.3ebdd6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4250.566513061523,
-    "y": 362.56654357910156,
-    "z": "294b5e8a.041612",
+    "x": 4258.566513061523,
+    "y": 317.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1a44842.2180c7c",
-        "958a84e8.9fbc48"
+        "f7578f2.98aaff",
+        "fec27249.f43818"
       ]
     ]
   },
   {
-    "id": "33242734.b6ef48",
+    "id": "41425976.6167f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3492.566635131836,
-    "y": 341.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 3500.566635131836,
+    "y": 296.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "afaee3e0.e6df98",
-        "db5b85f.aeb77f8"
+        "bf1caed6.dba4d",
+        "7892547.06584ac"
       ]
     ]
   },
   {
-    "id": "afaee3e0.e6df98",
+    "id": "bf1caed6.dba4d",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3773.566635131836,
-    "y": 297.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 3781.566635131836,
+    "y": 252.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c2880ab0.c73eb"
+        "37857fb8.f82a48"
       ]
     ]
   },
   {
-    "id": "c2880ab0.c73eb",
+    "id": "37857fb8.f82a48",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4035.566635131836,
-    "y": 297.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 4043.566635131836,
+    "y": 252.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8e081bd8.979208"
+        "d54e5594.aff43"
       ]
     ]
   },
   {
-    "id": "1a44842.2180c7c",
+    "id": "f7578f2.98aaff",
     "type": "set",
     "name": "set the 1st network-policy-id",
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 4493.566513061523,
-    "y": 319.56654357910156,
-    "z": "294b5e8a.041612",
+    "x": 4501.566513061523,
+    "y": 274.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "958a84e8.9fbc48",
+    "id": "fec27249.f43818",
     "type": "save",
     "name": "get network-policy from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
     "comments": "",
     "outputs": 1,
-    "x": 4482.566513061523,
-    "y": 374.56654357910156,
-    "z": "294b5e8a.041612",
+    "x": 4490.566513061523,
+    "y": 329.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4710cc76.36ad1c",
-        "efa019b.ed98a68",
-        "b08c41e4.127bd8"
+        "7d11439b.9c402c",
+        "1159889c.e4b977",
+        "672fe755.7cac68"
       ]
     ]
   },
   {
-    "id": "b08c41e4.127bd8",
+    "id": "672fe755.7cac68",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4733.566879272461,
-    "y": 315.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 4741.566879272461,
+    "y": 270.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7eb7952c.f46d84"
+        "8e6a85a9.42bd58"
       ]
     ]
   },
   {
-    "id": "7eb7952c.f46d84",
+    "id": "8e6a85a9.42bd58",
     "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": 4882.138412475586,
-    "y": 315.85243225097656,
-    "z": "294b5e8a.041612",
+    "x": 4890.138412475586,
+    "y": 270.85243225097656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "dd0313dc.1a2988",
+    "id": "d22f2789.6a3cb",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4881.075912475586,
-    "y": 359.99269104003906,
-    "z": "294b5e8a.041612",
+    "x": 4889.075912475586,
+    "y": 314.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "efa019b.ed98a68",
+    "id": "1159889c.e4b977",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4722.075912475586,
-    "y": 359.99269104003906,
-    "z": "294b5e8a.041612",
+    "x": 4730.075912475586,
+    "y": 314.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dd0313dc.1a2988"
+        "d22f2789.6a3cb"
       ]
     ]
   },
   {
-    "id": "4710cc76.36ad1c",
+    "id": "7d11439b.9c402c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4729.075912475586,
-    "y": 438.99269104003906,
-    "z": "294b5e8a.041612",
+    "x": 4737.075912475586,
+    "y": 393.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fbbb1a1a.e2c5b8"
+        "1927fc16.6351c4"
       ]
     ]
   },
   {
-    "id": "fbbb1a1a.e2c5b8",
+    "id": "1927fc16.6351c4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4868.075912475586,
-    "y": 438.99269104003906,
-    "z": "294b5e8a.041612",
+    "x": 4876.075912475586,
+    "y": 393.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7a803641.fde268",
-        "6a2b20cd.32701"
+        "4ec1a8d7.67b3c8",
+        "4af48fa4.c20fa"
       ]
     ]
   },
   {
-    "id": "7a803641.fde268",
+    "id": "4ec1a8d7.67b3c8",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5073.566879272461,
-    "y": 436.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 5081.566879272461,
+    "y": 391.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6a2b20cd.32701",
+    "id": "4af48fa4.c20fa",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5072.566879272461,
-    "y": 482.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 5080.566879272461,
+    "y": 437.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "db5b85f.aeb77f8",
+    "id": "7892547.06584ac",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3590.566635131836,
-    "y": 413.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 3598.566635131836,
+    "y": 368.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3d651743.57b188"
+        "ea9b4d5b.2a42f8"
       ]
     ]
   },
   {
-    "id": "3d651743.57b188",
+    "id": "ea9b4d5b.2a42f8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3870.566635131836,
-    "y": 413.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 3878.566635131836,
+    "y": 368.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "823d6ddb.3083e8"
+        "476ea684.13443"
       ]
     ]
   },
   {
-    "id": "823d6ddb.3083e8",
+    "id": "476ea684.13443",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2253.5667877197266,
-    "y": 826.5667877197266,
-    "z": "294b5e8a.041612",
+    "x": 2261.5667877197266,
+    "y": 781.5667877197266,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a4f7cdf6.5208e8"
+        "c7ca0b2.bde93f8"
       ]
     ]
   },
   {
-    "id": "a4f7cdf6.5208e8",
+    "id": "c7ca0b2.bde93f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2430.566665649414,
-    "y": 819.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 2438.566665649414,
+    "y": 774.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "eb8d4808.206a1",
-        "4f79166b.81752"
+        "86b11ccc.07eb1",
+        "5c684ea4.22866"
       ]
     ]
   },
   {
-    "id": "eb8d4808.206a1",
+    "id": "86b11ccc.07eb1",
     "type": "set",
     "name": "set the current logical-link-name",
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 2673.566665649414,
-    "y": 776.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 2681.566665649414,
+    "y": 731.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4f79166b.81752",
+    "id": "5c684ea4.22866",
     "type": "save",
     "name": "get logical-link from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
     "comments": "",
     "outputs": 1,
-    "x": 2662.566665649414,
-    "y": 831.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 2670.566665649414,
+    "y": 786.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "62989b79.9cfe9c",
-        "1988a7a4.ff123",
-        "85413e7a.b1b628"
+        "2c2754a5.0b7c2c",
+        "9ab044d8.9332",
+        "6aa476a7.c1db08"
       ]
     ]
   },
   {
-    "id": "62989b79.9cfe9c",
+    "id": "2c2754a5.0b7c2c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2954.057632446289,
-    "y": 810.1406402587891,
-    "z": "294b5e8a.041612",
+    "x": 2962.057632446289,
+    "y": 765.1406402587891,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f822b8e9.269d"
+        "606104a3.7d17dc"
       ]
     ]
   },
   {
-    "id": "1988a7a4.ff123",
+    "id": "9ab044d8.9332",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2942.566665649414,
-    "y": 854.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 2950.566665649414,
+    "y": 809.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b1dab01.deaad5"
+        "187a718c.4bcdf6"
       ]
     ]
   },
   {
-    "id": "f822b8e9.269d",
+    "id": "606104a3.7d17dc",
     "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": 3102.629165649414,
-    "y": 810.4264068603516,
-    "z": "294b5e8a.041612",
+    "x": 3110.629165649414,
+    "y": 765.4264068603516,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b1dab01.deaad5",
+    "id": "187a718c.4bcdf6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3101.566665649414,
-    "y": 854.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 3109.566665649414,
+    "y": 809.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "85413e7a.b1b628",
+    "id": "6aa476a7.c1db08",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2949.566665649414,
-    "y": 933.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 2957.566665649414,
+    "y": 888.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fb178b5b.3c4ae8"
+        "9fd32ca0.d84048"
       ]
     ]
   },
   {
-    "id": "fb178b5b.3c4ae8",
+    "id": "9fd32ca0.d84048",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3088.566665649414,
-    "y": 933.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 3096.566665649414,
+    "y": 888.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e94ce0e6.cdcf4",
-        "2a0a2d05.627212",
-        "2d29cc30.4d633c",
-        "8255fb50.a7b88",
-        "ea28bb0a.303ea8",
-        "4b5b0bf9.d92b04",
-        "42798389.0acfb4",
-        "29a6af57.132c2",
-        "18652387.ef4d1c",
-        "c49ed897.0159e8",
-        "9d2ec307.fb07b8",
-        "c81a19d9.9b256",
-        "b5b402c1.c35e88",
-        "84774758.102ed8",
-        "17e6527f.ea49de",
-        "c22e8ab9.0a6b88",
-        "647f2e19.e50158",
-        "9c75cfb6.9dae68",
-        "9a8ce081.e6446",
-        "c989c621.8b708",
-        "88b89d66.20648"
+        "7a7db7d4.95d8d",
+        "95e88e5b.59dc68",
+        "ccbad682.f9f6e",
+        "51c5f691.62046",
+        "c524ae07.05ca4",
+        "573995f0.c3e824",
+        "40c97410.34efdc",
+        "3ceacdf9.dad772",
+        "37ff3aef.9a54ee",
+        "a62852b2.29136",
+        "e4c9b14e.e493e",
+        "a5e91f89.51e28",
+        "6a1545ce.c6f074",
+        "fcc163b9.6d6e2",
+        "c9e93381.966988",
+        "5fc9799.82ba788",
+        "7ebd6769.0b5428",
+        "9fbb56ee.c43378",
+        "387e5bde.fd50e4",
+        "a78822a6.5321b",
+        "a4c94b0b.1b4718"
       ]
     ]
   },
   {
-    "id": "31581a8c.76364e",
+    "id": "8a5fb9f9.eee92",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3437.566665649414,
-    "y": 467.56663513183594,
-    "z": "294b5e8a.041612",
+    "x": 3445.566665649414,
+    "y": 422.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e94ce0e6.cdcf4",
+    "id": "7a7db7d4.95d8d",
     "type": "execute",
     "name": "execute UUID generator for otn-tunnel-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3418.566604614258,
-    "y": 546.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 3426.566604614258,
+    "y": 501.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "84774758.102ed8",
+    "id": "fcc163b9.6d6e2",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 3375.566604614258,
-    "y": 591.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 3383.566604614258,
+    "y": 546.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2a0a2d05.627212",
+    "id": "95e88e5b.59dc68",
     "type": "set",
     "name": "set network-route-one",
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
     "comments": "",
-    "x": 3340.566635131836,
-    "y": 645.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 3348.566635131836,
+    "y": 600.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2d29cc30.4d633c",
+    "id": "ccbad682.f9f6e",
     "type": "set",
     "name": "set network-route-two",
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
     "comments": "",
-    "x": 3341.566635131836,
-    "y": 700.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 3349.566635131836,
+    "y": 655.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8255fb50.a7b88",
+    "id": "51c5f691.62046",
     "type": "save",
     "name": "get network-route-one from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
     "comments": "",
     "outputs": 1,
-    "x": 3339.566635131836,
-    "y": 964.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 3347.566635131836,
+    "y": 919.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bc9dba3e.42915",
-        "4ccb40e3.75eb",
-        "6e77d52e.d49a5c"
+        "ab7d525c.39024",
+        "e9514e17.b4663",
+        "e95aa54a.0cb1c8"
       ]
     ]
   },
   {
-    "id": "ea28bb0a.303ea8",
+    "id": "c524ae07.05ca4",
     "type": "save",
     "name": "get network-route-two from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
     "comments": "",
     "outputs": 1,
-    "x": 3334.566635131836,
-    "y": 1025.5665130615234,
-    "z": "294b5e8a.041612",
+    "x": 3342.566635131836,
+    "y": 980.5665130615234,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ddf0ef9b.af495",
-        "d012a2e6.7e886",
-        "c732ba74.e6ac38"
+        "ba38cd77.3ddd8",
+        "3fe85825.5036d",
+        "4b77c928.b0503"
       ]
     ]
   },
   {
-    "id": "bc9dba3e.42915",
+    "id": "ab7d525c.39024",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3650.566635131836,
-    "y": 735.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 3658.566635131836,
+    "y": 690.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d26a86c.70f36f8"
+        "a41dfa2.144c608"
       ]
     ]
   },
   {
-    "id": "4ccb40e3.75eb",
+    "id": "e9514e17.b4663",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3646.075668334961,
-    "y": 784.9926605224609,
-    "z": "294b5e8a.041612",
+    "x": 3654.075668334961,
+    "y": 739.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3592fdd4.1e4502"
+        "88fea61b.80803"
       ]
     ]
   },
   {
-    "id": "6e77d52e.d49a5c",
+    "id": "e95aa54a.0cb1c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3650.075668334961,
-    "y": 837.9926605224609,
-    "z": "294b5e8a.041612",
+    "x": 3658.075668334961,
+    "y": 792.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f6681e1c.b1626"
+        "5f495b77.8e475c"
       ]
     ]
   },
   {
-    "id": "d26a86c.70f36f8",
+    "id": "a41dfa2.144c608",
     "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": 3799.138168334961,
-    "y": 734.8524017333984,
-    "z": "294b5e8a.041612",
+    "x": 3807.138168334961,
+    "y": 689.8524017333984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3592fdd4.1e4502",
+    "id": "88fea61b.80803",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3789.075668334961,
-    "y": 784.9926605224609,
-    "z": "294b5e8a.041612",
+    "x": 3797.075668334961,
+    "y": 739.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ddf0ef9b.af495",
+    "id": "ba38cd77.3ddd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3612.566604614258,
-    "y": 925.5664825439453,
-    "z": "294b5e8a.041612",
+    "x": 3620.566604614258,
+    "y": 880.5664825439453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "275632fb.e09a86"
+        "5d8c160b.0c4ea8"
       ]
     ]
   },
   {
-    "id": "d012a2e6.7e886",
+    "id": "3fe85825.5036d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3608.075668334961,
-    "y": 967.9925384521484,
-    "z": "294b5e8a.041612",
+    "x": 3616.075668334961,
+    "y": 922.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "984e984a.f448c8"
+        "b6433621.de36a"
       ]
     ]
   },
   {
-    "id": "c732ba74.e6ac38",
+    "id": "4b77c928.b0503",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3609.075668334961,
-    "y": 1020.9925384521484,
-    "z": "294b5e8a.041612",
+    "x": 3617.075668334961,
+    "y": 975.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2eeb8181.d4367e"
+        "999aafa8.043a8"
       ]
     ]
   },
   {
-    "id": "275632fb.e09a86",
+    "id": "5d8c160b.0c4ea8",
     "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": 3761.138137817383,
-    "y": 924.8522491455078,
-    "z": "294b5e8a.041612",
+    "x": 3769.138137817383,
+    "y": 879.8522491455078,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "984e984a.f448c8",
+    "id": "b6433621.de36a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3751.075668334961,
-    "y": 967.9925384521484,
-    "z": "294b5e8a.041612",
+    "x": 3759.075668334961,
+    "y": 922.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f6681e1c.b1626",
+    "id": "5f495b77.8e475c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3811.566635131836,
-    "y": 837.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 3819.566635131836,
+    "y": 792.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "caab91f.12177f"
+        "f4d50ce3.687d98"
       ]
     ]
   },
   {
-    "id": "2eeb8181.d4367e",
+    "id": "999aafa8.043a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3762.566635131836,
-    "y": 1020.5665130615234,
-    "z": "294b5e8a.041612",
+    "x": 3770.566635131836,
+    "y": 975.5665130615234,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9eb76f3a.cfcbd8"
+        "6c0d4a32.4f3524"
       ]
     ]
   },
   {
-    "id": "caab91f.12177f",
+    "id": "f4d50ce3.687d98",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3986.566635131836,
-    "y": 811.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 3994.566635131836,
+    "y": 766.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2172bcb.4fd5b44",
-        "c6b4aa53.9764a8",
-        "fbdccf10.5fabc"
+        "e8eddbb7.6cfbd",
+        "54846c0d.33a74c",
+        "b03ebc69.8e68d8"
       ]
     ]
   },
   {
-    "id": "9eb76f3a.cfcbd8",
+    "id": "6c0d4a32.4f3524",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3946.566635131836,
-    "y": 928.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 3954.566635131836,
+    "y": 883.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "572a469b.71d458",
-        "b8b0db7f.0d0b98",
-        "56529717.d57cf"
+        "4f37a3d1.2e362c",
+        "efd815b8.8e6db8",
+        "65095290.735c7c"
       ]
     ]
   },
   {
-    "id": "2172bcb.4fd5b44",
+    "id": "e8eddbb7.6cfbd",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4108.566635131836,
-    "y": 596.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 4116.566635131836,
+    "y": 551.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b34792b6.2f84b"
+        "c7edad0e.b216"
       ]
     ]
   },
   {
-    "id": "c6b4aa53.9764a8",
+    "id": "54846c0d.33a74c",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4110.566635131836,
-    "y": 650.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 4118.566635131836,
+    "y": 605.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8791b1f2.9fddd"
+        "d5f61daa.4b4388"
       ]
     ]
   },
   {
-    "id": "572a469b.71d458",
+    "id": "4f37a3d1.2e362c",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4127.566665649414,
-    "y": 866.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 4135.566665649414,
+    "y": 821.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2e043645.b8ff02"
+        "81e90993.f1d9a8"
       ]
     ]
   },
   {
-    "id": "b8b0db7f.0d0b98",
+    "id": "efd815b8.8e6db8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4129.566665649414,
-    "y": 920.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 4137.566665649414,
+    "y": 875.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8eeda316.6df7"
+        "da2103e1.15169"
       ]
     ]
   },
   {
-    "id": "9e47fb61.f661c8",
+    "id": "f5d37541.2d47c8",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4418.566635131836,
-    "y": 548.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 4426.566635131836,
+    "y": 503.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "21b58670.3a1192",
+    "id": "2bfe954c.51473a",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4411.566635131836,
-    "y": 646.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 4419.566635131836,
+    "y": 601.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d0dd5f40.4b5f38",
+    "id": "9391f162.46d07",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4429.566665649414,
-    "y": 839.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 4437.566665649414,
+    "y": 794.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d70d7c37.e21f5",
+    "id": "8da0410.b4be6c",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4433.566665649414,
-    "y": 932.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 4441.566665649414,
+    "y": 887.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a539fdfb.953e38",
+    "id": "c685a00a.7f3668",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3576.566665649414,
-    "y": 1604.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3584.566665649414,
+    "y": 1559.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7f7f51c3.cfe0e"
+        "3e8c64de.c5d6ac"
       ]
     ]
   },
   {
-    "id": "a32c9d1e.59f95",
+    "id": "c307eb50.c4efc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3586.057632446289,
-    "y": 1647.1407012939453,
-    "z": "294b5e8a.041612",
+    "x": 3594.057632446289,
+    "y": 1602.1407012939453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ea2bacf1.80819"
+        "a457c21e.dc24c"
       ]
     ]
   },
   {
-    "id": "fb2990eb.3d37b8",
+    "id": "fe413554.38fd68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3574.566665649414,
-    "y": 1693.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3582.566665649414,
+    "y": 1648.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "495659dd.a8b668"
+        "f7393df4.54a488"
       ]
     ]
   },
   {
-    "id": "c88f575a.f847c",
+    "id": "940c17a9.af2df",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3276.566665649414,
-    "y": 1566.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3284.566665649414,
+    "y": 1521.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "42798389.0acfb4",
+    "id": "40c97410.34efdc",
     "type": "save",
     "name": "get p-interface-src from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3319.566665649414,
-    "y": 1631.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3327.566665649414,
+    "y": 1586.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a539fdfb.953e38",
-        "a32c9d1e.59f95",
-        "fb2990eb.3d37b8"
+        "c685a00a.7f3668",
+        "c307eb50.c4efc",
+        "fe413554.38fd68"
       ]
     ]
   },
   {
-    "id": "4b5b0bf9.d92b04",
+    "id": "573995f0.c3e824",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3320.566665649414,
-    "y": 1301.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3328.566665649414,
+    "y": 1256.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7927223e.403f8c",
-        "cb61ec61.ad89d"
+        "ce053797.967e5",
+        "1d8318a4.118f1f"
       ]
     ]
   },
   {
-    "id": "cb61ec61.ad89d",
+    "id": "1d8318a4.118f1f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3541.566635131836,
-    "y": 1354.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3549.566635131836,
+    "y": 1309.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b9b2d4da.80c098"
+        "d7acba72.b8d088"
       ]
     ]
   },
   {
-    "id": "7927223e.403f8c",
+    "id": "ce053797.967e5",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3543.566635131836,
-    "y": 1387.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3551.566635131836,
+    "y": 1342.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3bca8d9d.c75392"
+        "b936608f.415c9"
       ]
     ]
   },
   {
-    "id": "7f7f51c3.cfe0e",
+    "id": "3e8c64de.c5d6ac",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3749.233169555664,
-    "y": 1603.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3757.233169555664,
+    "y": 1558.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f7adce7b.f663c8",
-        "aab5a13f.7b9228"
+        "61a62886.979d9",
+        "69747a1f.4d36a4"
       ]
     ]
   },
   {
-    "id": "ea2bacf1.80819",
+    "id": "a457c21e.dc24c",
     "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": 3739.6290435791016,
-    "y": 1650.4264373779297,
-    "z": "294b5e8a.041612",
+    "x": 3747.6290435791016,
+    "y": 1605.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "495659dd.a8b668",
+    "id": "f7393df4.54a488",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3743.566665649414,
-    "y": 1694.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3751.566665649414,
+    "y": 1649.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f7adce7b.f663c8",
+    "id": "61a62886.979d9",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4013.566665649414,
-    "y": 1587.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4021.566665649414,
+    "y": 1542.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "eba55ae6.b47008",
-        "a5049a4a.932988"
+        "d27c3919.e4f1e8",
+        "744ce69a.cd2cd"
       ]
     ]
   },
   {
-    "id": "a5049a4a.932988",
+    "id": "744ce69a.cd2cd",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4236.566665649414,
-    "y": 1542.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4244.566665649414,
+    "y": 1497.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b0af1c9f.1d33f"
+        "d24d75df.899958"
       ]
     ]
   },
   {
-    "id": "eba55ae6.b47008",
+    "id": "d27c3919.e4f1e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4238.566665649414,
-    "y": 1606.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4246.566665649414,
+    "y": 1561.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3044898a.b774b6"
+        "195cae09.6a270a"
       ]
     ]
   },
   {
-    "id": "3044898a.b774b6",
+    "id": "195cae09.6a270a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4400.566665649414,
-    "y": 1602.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4408.566665649414,
+    "y": 1557.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b0af1c9f.1d33f",
+    "id": "d24d75df.899958",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4401.566665649414,
-    "y": 1539.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4409.566665649414,
+    "y": 1494.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3cd7ef1e.9f6f38",
-        "782ad12.44a143"
+        "64761578.742944",
+        "545ae19b.2a1238"
       ]
     ]
   },
   {
-    "id": "3bca8d9d.c75392",
+    "id": "b936608f.415c9",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3686.566635131836,
-    "y": 1384.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3694.566635131836,
+    "y": 1339.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b9b2d4da.80c098",
+    "id": "d7acba72.b8d088",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3689.566635131836,
-    "y": 1347.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3697.566635131836,
+    "y": 1302.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2e849446.924674",
-        "15f06507.bc03a3"
+        "66afead4.578fec",
+        "d914a00d.43d42"
       ]
     ]
   },
   {
-    "id": "2e849446.924674",
+    "id": "66afead4.578fec",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3863.566635131836,
-    "y": 1303.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3871.566635131836,
+    "y": 1258.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "aab5a13f.7b9228",
+    "id": "69747a1f.4d36a4",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3962.566635131836,
-    "y": 1697.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3970.566635131836,
+    "y": 1652.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7f3dbf41.0b7cb"
+        "6692ad9d.63a244"
       ]
     ]
   },
   {
-    "id": "7f3dbf41.0b7cb",
+    "id": "6692ad9d.63a244",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4168.566635131836,
-    "y": 1697.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 4176.566635131836,
+    "y": 1652.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "33161afe.bf5fb6"
+        "efeaf290.376e48"
       ]
     ]
   },
   {
-    "id": "33161afe.bf5fb6",
+    "id": "efeaf290.376e48",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4383.852279663086,
-    "y": 1697.388412475586,
-    "z": "294b5e8a.041612",
+    "x": 4391.852279663086,
+    "y": 1652.388412475586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d1f5e6bd.d6c388"
+        "9388038d.e5f508"
       ]
     ]
   },
   {
-    "id": "15f06507.bc03a3",
+    "id": "d914a00d.43d42",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3878.566635131836,
-    "y": 1414.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3886.566635131836,
+    "y": 1369.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "609f91e1.96d3c",
-        "c5dd830a.81bd98",
-        "f762b67a.3d2c8"
+        "3150a2ed.678f16",
+        "5769f8b6.da962",
+        "c8b63edf.598bb8"
       ]
     ]
   },
   {
-    "id": "609f91e1.96d3c",
+    "id": "3150a2ed.678f16",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4074.0667572021484,
-    "y": 1366.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 4082.0667572021484,
+    "y": 1321.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "964976f5.819d98"
+        "47f6939a.0cca7c"
       ]
     ]
   },
   {
-    "id": "c5dd830a.81bd98",
+    "id": "5769f8b6.da962",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4066.0667572021484,
-    "y": 1421.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 4074.0667572021484,
+    "y": 1376.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bf5b62.bbb734a"
+        "dfce5624.4d0e8"
       ]
     ]
   },
   {
-    "id": "f762b67a.3d2c8",
+    "id": "c8b63edf.598bb8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4071.0667572021484,
-    "y": 1478.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 4079.0667572021484,
+    "y": 1433.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bc48235e.ca1af8"
+        "16d53904.a69817"
       ]
     ]
   },
   {
-    "id": "bc48235e.ca1af8",
+    "id": "16d53904.a69817",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4223.066757202148,
-    "y": 1479.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 4231.066757202148,
+    "y": 1434.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bf5b62.bbb734a",
+    "id": "dfce5624.4d0e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4234.066757202148,
-    "y": 1424.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 4242.066757202148,
+    "y": 1379.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "964976f5.819d98",
+    "id": "47f6939a.0cca7c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4218.449081420898,
-    "y": 1364.2223052978516,
-    "z": "294b5e8a.041612",
+    "x": 4226.449081420898,
+    "y": 1319.2223052978516,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "242018b6.f49c88"
+        "57719ed2.829e5"
       ]
     ]
   },
   {
-    "id": "242018b6.f49c88",
+    "id": "57719ed2.829e5",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4402.566635131836,
-    "y": 1378.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 4410.566635131836,
+    "y": 1333.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fc08eb6a.2320e"
+        "8b55301b.b943a8"
       ]
     ]
   },
   {
-    "id": "782ad12.44a143",
+    "id": "545ae19b.2a1238",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
     "comments": "",
-    "x": 4571.566665649414,
-    "y": 1497.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4579.566665649414,
+    "y": 1452.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3cd7ef1e.9f6f38",
+    "id": "64761578.742944",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
     "comments": "",
-    "x": 4572.566665649414,
-    "y": 1605.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4580.566665649414,
+    "y": 1560.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9dc8c404.7ec36",
+    "id": "3bbb3a78.1e825e",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4573.566665649414,
-    "y": 1554.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4581.566665649414,
+    "y": 1509.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d1f5e6bd.d6c388",
+    "id": "9388038d.e5f508",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4590.683822631836,
-    "y": 1697.906967163086,
-    "z": "294b5e8a.041612",
+    "x": 4598.683822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "333e33dc.560624",
-        "7db36be0.62778c",
-        "5d7040fa.99ac2"
+        "13805827.ade3d",
+        "a9502d93.1e2b78",
+        "a1b1941b.f9c738"
       ]
     ]
   },
   {
-    "id": "333e33dc.560624",
+    "id": "13805827.ade3d",
     "type": "set",
     "name": "set source ttp-id",
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4805.683822631836,
-    "y": 1659.906967163086,
-    "z": "294b5e8a.041612",
+    "x": 4813.683822631836,
+    "y": 1614.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7db36be0.62778c",
+    "id": "a9502d93.1e2b78",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4802.683822631836,
-    "y": 1698.906967163086,
-    "z": "294b5e8a.041612",
+    "x": 4810.683822631836,
+    "y": 1653.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2d9a4fac.ae36b8"
+        "b0dee9b7.4f5918"
       ]
     ]
   },
   {
-    "id": "5d7040fa.99ac2",
+    "id": "a1b1941b.f9c738",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4758.183822631836,
-    "y": 1740.906967163086,
-    "z": "294b5e8a.041612",
+    "x": 4766.183822631836,
+    "y": 1695.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2d9a4fac.ae36b8",
+    "id": "b0dee9b7.4f5918",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4983.183822631836,
-    "y": 1697.906967163086,
-    "z": "294b5e8a.041612",
+    "x": 4991.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a4ece740.b4105"
+        "915aa3e1.c4697"
       ]
     ]
   },
   {
-    "id": "52e1d551.a483dc",
+    "id": "25f4a2bf.12e7a6",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4802.566665649414,
-    "y": 1315.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4810.566665649414,
+    "y": 1270.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7de9311.18a165"
+        "5118de9a.01dd88"
       ]
     ]
   },
   {
-    "id": "7de9311.18a165",
+    "id": "5118de9a.01dd88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4979.566665649414,
-    "y": 1307.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4987.566665649414,
+    "y": 1262.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fff1a40e.199ba",
-        "7abb7683.fa5358"
+        "94a9a0f9.c59e58",
+        "85408268.2c3368"
       ]
     ]
   },
   {
-    "id": "fc08eb6a.2320e",
+    "id": "8b55301b.b943a8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4597.566635131836,
-    "y": 1378.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 4605.566635131836,
+    "y": 1333.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "52e1d551.a483dc",
-        "6d2d083c.e53ec8"
+        "25f4a2bf.12e7a6",
+        "95e8d812.cc8ca8"
       ]
     ]
   },
   {
-    "id": "6d2d083c.e53ec8",
+    "id": "95e8d812.cc8ca8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4805.566665649414,
-    "y": 1389.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4813.566665649414,
+    "y": 1344.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b42cfcde.f4ebc8"
+        "f38eef5.12b7d1"
       ]
     ]
   },
   {
-    "id": "b42cfcde.f4ebc8",
+    "id": "f38eef5.12b7d1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4982.566665649414,
-    "y": 1381.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4990.566665649414,
+    "y": 1336.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e8e280e3.a65e5"
+        "c816565f.10d5d"
       ]
     ]
   },
   {
-    "id": "a4ece740.b4105",
+    "id": "915aa3e1.c4697",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5141.183822631836,
-    "y": 1697.906967163086,
-    "z": "294b5e8a.041612",
+    "x": 5149.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "425d708e.783968"
+        "6c003d6.b17f944"
       ]
     ]
   },
   {
-    "id": "425d708e.783968",
+    "id": "6c003d6.b17f944",
     "type": "set",
     "name": "set source tunnel tp ip",
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5348.183822631836,
-    "y": 1697.906967163086,
-    "z": "294b5e8a.041612",
+    "x": 5356.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7abb7683.fa5358",
+    "id": "85408268.2c3368",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5187.566665649414,
-    "y": 1314.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5195.566665649414,
+    "y": 1269.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "45403a46.69b7f4",
-        "ab6bed09.5e53d",
-        "1ce7c845.052f38"
+        "53b236d8.1b02c",
+        "4083b24b.fff034",
+        "39446af.e663d96"
       ]
     ]
   },
   {
-    "id": "fff1a40e.199ba",
+    "id": "94a9a0f9.c59e58",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5217.566665649414,
-    "y": 1262.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5225.566665649414,
+    "y": 1217.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "45403a46.69b7f4",
+    "id": "53b236d8.1b02c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5397.566665649414,
-    "y": 1305.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5405.566665649414,
+    "y": 1260.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f2e23e54.aa63c8"
+        "85a67c1c.71be78"
       ]
     ]
   },
   {
-    "id": "ab6bed09.5e53d",
+    "id": "4083b24b.fff034",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5389.566665649414,
-    "y": 1360.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5397.566665649414,
+    "y": 1315.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "29b1e9b9.e1584e"
+        "ef1cd568.ee18"
       ]
     ]
   },
   {
-    "id": "1ce7c845.052f38",
+    "id": "39446af.e663d96",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.566665649414,
-    "y": 1417.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5402.566665649414,
+    "y": 1372.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "26b11425.c22444"
+        "9b4ff565.a53cd"
       ]
     ]
   },
   {
-    "id": "26b11425.c22444",
+    "id": "9b4ff565.a53cd",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5546.566665649414,
-    "y": 1418.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5554.566665649414,
+    "y": 1373.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "29b1e9b9.e1584e",
+    "id": "ef1cd568.ee18",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5557.566665649414,
-    "y": 1363.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5565.566665649414,
+    "y": 1318.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f2e23e54.aa63c8",
+    "id": "85a67c1c.71be78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5541.948989868164,
-    "y": 1303.2223358154297,
-    "z": "294b5e8a.041612",
+    "x": 5549.948989868164,
+    "y": 1258.2223358154297,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a969095b.c118"
+        "53e9aeb2.242928"
       ]
     ]
   },
   {
-    "id": "e8e280e3.a65e5",
+    "id": "c816565f.10d5d",
     "type": "set",
     "name": "set domainA ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5217.566665649414,
-    "y": 1505.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5225.566665649414,
+    "y": 1460.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a969095b.c118",
+    "id": "53e9aeb2.242928",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5756.566665649414,
-    "y": 1299.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5764.566665649414,
+    "y": 1254.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3c38a36b.8cf1d4",
+    "id": "bd4af2f9.e804e",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4406.566635131836,
-    "y": 584.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 4414.566635131836,
+    "y": 539.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "66912289.29f5fc",
+    "id": "ff102e0b.75a238",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4397.566635131836,
-    "y": 682.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 4405.566635131836,
+    "y": 637.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b34792b6.2f84b",
+    "id": "c7edad0e.b216",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4231.566635131836,
-    "y": 590.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 4239.566635131836,
+    "y": 545.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9e47fb61.f661c8",
-        "3c38a36b.8cf1d4"
+        "f5d37541.2d47c8",
+        "bd4af2f9.e804e"
       ]
     ]
   },
   {
-    "id": "8791b1f2.9fddd",
+    "id": "d5f61daa.4b4388",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4237.566635131836,
-    "y": 654.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 4245.566635131836,
+    "y": 609.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "21b58670.3a1192",
-        "66912289.29f5fc"
+        "2bfe954c.51473a",
+        "ff102e0b.75a238"
       ]
     ]
   },
   {
-    "id": "2e043645.b8ff02",
+    "id": "81e90993.f1d9a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4255.566665649414,
-    "y": 866.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 4263.566665649414,
+    "y": 821.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d0dd5f40.4b5f38",
-        "fac3c269.3e8818"
+        "9391f162.46d07",
+        "cb81a4f3.d6156"
       ]
     ]
   },
   {
-    "id": "8eeda316.6df7",
+    "id": "da2103e1.15169",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4258.566665649414,
-    "y": 919.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 4266.566665649414,
+    "y": 874.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d70d7c37.e21f5",
-        "d978bf81.a682c8"
+        "8da0410.b4be6c",
+        "e6103926.96cb88"
       ]
     ]
   },
   {
-    "id": "fac3c269.3e8818",
+    "id": "cb81a4f3.d6156",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4415.566665649414,
-    "y": 879.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 4423.566665649414,
+    "y": 834.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d978bf81.a682c8",
+    "id": "e6103926.96cb88",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4418.566665649414,
-    "y": 970.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 4426.566665649414,
+    "y": 925.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "98a290a7.380a3",
+    "id": "9fb68dad.7c92d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3710.566635131836,
-    "y": 2097.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3718.566635131836,
+    "y": 2052.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e497858e.0123a",
-        "498e60f5.55f178"
+        "931d0e50.a84728",
+        "4385be6.d4f41c"
       ]
     ]
   },
   {
-    "id": "7f085da3.5b6764",
+    "id": "62a0ff40.3fa718",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3537.900131225586,
-    "y": 2098.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3545.900131225586,
+    "y": 2053.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "98a290a7.380a3"
+        "9fb68dad.7c92d"
       ]
     ]
   },
   {
-    "id": "92e1b5b8.c9d748",
+    "id": "a9db3cf5.8c98a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3547.391098022461,
-    "y": 2141.140670776367,
-    "z": "294b5e8a.041612",
+    "x": 3555.391098022461,
+    "y": 2096.140670776367,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b56c748b.ef0b98"
+        "b1d5af05.b8b6a"
       ]
     ]
   },
   {
-    "id": "67d077ec.f8e2b8",
+    "id": "e64b0ffd.d5764",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3535.900131225586,
-    "y": 2187.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3543.900131225586,
+    "y": 2142.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "531aab62.3c8d74"
+        "c5461a06.0ba95"
       ]
     ]
   },
   {
-    "id": "b56c748b.ef0b98",
+    "id": "b1d5af05.b8b6a",
     "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": 3700.9625091552734,
-    "y": 2144.4264068603516,
-    "z": "294b5e8a.041612",
+    "x": 3708.9625091552734,
+    "y": 2099.4264068603516,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "531aab62.3c8d74",
+    "id": "c5461a06.0ba95",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3704.900131225586,
-    "y": 2188.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3712.900131225586,
+    "y": 2143.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e497858e.0123a",
+    "id": "931d0e50.a84728",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3996.900131225586,
-    "y": 2101.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4004.900131225586,
+    "y": 2056.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f5003287.c43b28",
-        "e21b6e0c.643e48"
+        "ff2f7e35.94528",
+        "ccece71a.073de8"
       ]
     ]
   },
   {
-    "id": "e21b6e0c.643e48",
+    "id": "ccece71a.073de8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4219.900131225586,
-    "y": 2056.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4227.900131225586,
+    "y": 2011.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1c25bfa5.0e84a8"
+        "c18c40eb.b59cb8"
       ]
     ]
   },
   {
-    "id": "f5003287.c43b28",
+    "id": "ff2f7e35.94528",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4221.900131225586,
-    "y": 2120.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4229.900131225586,
+    "y": 2075.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9df0e8d3.70e7b"
+        "a47e6ec9.683da"
       ]
     ]
   },
   {
-    "id": "9df0e8d3.70e7b",
+    "id": "a47e6ec9.683da",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4380.900131225586,
-    "y": 2139.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4388.900131225586,
+    "y": 2094.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1c25bfa5.0e84a8",
+    "id": "c18c40eb.b59cb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4384.900131225586,
-    "y": 2053.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4392.900131225586,
+    "y": 2008.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "15645f19.451cd9",
-        "5b635208.85addc"
+        "50191e6c.286e58",
+        "e564295c.7502a8"
       ]
     ]
   },
   {
-    "id": "18652387.ef4d1c",
+    "id": "37ff3aef.9a54ee",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3309.900131225586,
-    "y": 2133.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3317.900131225586,
+    "y": 2088.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7f085da3.5b6764",
-        "92e1b5b8.c9d748",
-        "67d077ec.f8e2b8"
+        "62a0ff40.3fa718",
+        "a9db3cf5.8c98a8",
+        "e64b0ffd.d5764"
       ]
     ]
   },
   {
-    "id": "8fa3650.6227a18",
+    "id": "e2a5ba2c.d267c",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3270.900131225586,
-    "y": 2077.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3278.900131225586,
+    "y": 2032.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "29a6af57.132c2",
+    "id": "3ceacdf9.dad772",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3329.900131225586,
-    "y": 1873.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3337.900131225586,
+    "y": 1828.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7f4e16fd.13b25",
-        "9c29704e.b9eca8"
+        "fc191473.db2cb8",
+        "44d4fd2b.8896cc"
       ]
     ]
   },
   {
-    "id": "9c29704e.b9eca8",
+    "id": "44d4fd2b.8896cc",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3552.900131225586,
-    "y": 1859.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3560.900131225586,
+    "y": 1814.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bb1e4e57.280888"
+        "e4dd083d.cd18f8"
       ]
     ]
   },
   {
-    "id": "7f4e16fd.13b25",
+    "id": "fc191473.db2cb8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3554.900131225586,
-    "y": 1892.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3562.900131225586,
+    "y": 1847.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b75dfd73.636e48"
+        "28eac456.f04cbc"
       ]
     ]
   },
   {
-    "id": "b75dfd73.636e48",
+    "id": "28eac456.f04cbc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3697.900131225586,
-    "y": 1889.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3705.900131225586,
+    "y": 1844.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bb1e4e57.280888",
+    "id": "e4dd083d.cd18f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3700.900131225586,
-    "y": 1852.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3708.900131225586,
+    "y": 1807.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bda8773a.f12a1",
-        "d5e4b6e4.115dd8"
+        "c8368cdf.b15f18",
+        "26325ab5.37c516"
       ]
     ]
   },
   {
-    "id": "bda8773a.f12a1",
+    "id": "c8368cdf.b15f18",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3894.900131225586,
-    "y": 1855.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 3902.900131225586,
+    "y": 1810.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "498e60f5.55f178",
+    "id": "4385be6.d4f41c",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3947.900100708008,
-    "y": 2224.566604614258,
-    "z": "294b5e8a.041612",
+    "x": 3955.900100708008,
+    "y": 2179.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f195472b.83ff2"
+        "ab5afaa2.b8a2e"
       ]
     ]
   },
   {
-    "id": "f195472b.83ff2",
+    "id": "ab5afaa2.b8a2e",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4153.900100708008,
-    "y": 2224.566604614258,
-    "z": "294b5e8a.041612",
+    "x": 4161.900100708008,
+    "y": 2179.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2e029795.f674f8"
+        "8b90a37d.df48a8"
       ]
     ]
   },
   {
-    "id": "2e029795.f674f8",
+    "id": "8b90a37d.df48a8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4371.185745239258,
-    "y": 2223.388381958008,
-    "z": "294b5e8a.041612",
+    "x": 4379.185745239258,
+    "y": 2178.388381958008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d2261f5.b9fa08"
+        "9497250f.2d9438"
       ]
     ]
   },
   {
-    "id": "d5e4b6e4.115dd8",
+    "id": "26325ab5.37c516",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.900131225586,
-    "y": 1923.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 3924.900131225586,
+    "y": 1878.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6730b25.e0c5f4c",
-        "c5d11aca.de4aa8",
-        "359fd71e.08e5b"
+        "572475c6.9df474",
+        "8a4bcee9.a6e838",
+        "52414e68.698aa8"
       ]
     ]
   },
   {
-    "id": "6730b25.e0c5f4c",
+    "id": "572475c6.9df474",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4112.400253295898,
-    "y": 1875.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4120.400253295898,
+    "y": 1830.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "11cc1f31.73aba1"
+        "cc04a6ba.577058"
       ]
     ]
   },
   {
-    "id": "c5d11aca.de4aa8",
+    "id": "8a4bcee9.a6e838",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4104.400253295898,
-    "y": 1930.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4112.400253295898,
+    "y": 1885.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5b1bf93a.85704"
+        "5bcad340.b7a94c"
       ]
     ]
   },
   {
-    "id": "359fd71e.08e5b",
+    "id": "52414e68.698aa8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4109.400253295898,
-    "y": 1987.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4117.400253295898,
+    "y": 1942.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "150deb8f.b69cd4"
+        "78c91f5c.6a81a"
       ]
     ]
   },
   {
-    "id": "150deb8f.b69cd4",
+    "id": "78c91f5c.6a81a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4261.400253295898,
-    "y": 1988.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4269.400253295898,
+    "y": 1943.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5b1bf93a.85704",
+    "id": "5bcad340.b7a94c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4272.400253295898,
-    "y": 1933.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4280.400253295898,
+    "y": 1888.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "11cc1f31.73aba1",
+    "id": "cc04a6ba.577058",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4256.782577514648,
-    "y": 1873.222427368164,
-    "z": "294b5e8a.041612",
+    "x": 4264.782577514648,
+    "y": 1828.222427368164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cff6dd9b.8cbec"
+        "b056f70a.5ef0e"
       ]
     ]
   },
   {
-    "id": "15645f19.451cd9",
+    "id": "50191e6c.286e58",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
     "comments": "",
-    "x": 4554.900131225586,
-    "y": 2014.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4562.900131225586,
+    "y": 1969.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5b635208.85addc",
+    "id": "e564295c.7502a8",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
     "comments": "",
-    "x": 4555.900131225586,
-    "y": 2119.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4563.900131225586,
+    "y": 2074.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f4c1e1b8.e7b4e8",
+    "id": "4a5f1f34.b170c",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4550.900131225586,
-    "y": 2068.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4558.900131225586,
+    "y": 2023.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9d2261f5.b9fa08",
+    "id": "9497250f.2d9438",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4578.017288208008,
-    "y": 2212.9070587158203,
-    "z": "294b5e8a.041612",
+    "x": 4586.017288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "84d8ab80.c7c5d8",
-        "e6773f2f.211b88",
-        "2391fc90.5865f4"
+        "dc5203d6.63ee88",
+        "bfaf928b.d789b",
+        "75ef4dfa.4963fc"
       ]
     ]
   },
   {
-    "id": "84d8ab80.c7c5d8",
+    "id": "dc5203d6.63ee88",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4793.017288208008,
-    "y": 2174.9070587158203,
-    "z": "294b5e8a.041612",
+    "x": 4801.017288208008,
+    "y": 2129.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e6773f2f.211b88",
+    "id": "bfaf928b.d789b",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4790.017288208008,
-    "y": 2213.9070587158203,
-    "z": "294b5e8a.041612",
+    "x": 4798.017288208008,
+    "y": 2168.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e6f8fe6a.d80188"
+        "6dd4b7bc.60078"
       ]
     ]
   },
   {
-    "id": "2391fc90.5865f4",
+    "id": "75ef4dfa.4963fc",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4745.517288208008,
-    "y": 2255.9070587158203,
-    "z": "294b5e8a.041612",
+    "x": 4753.517288208008,
+    "y": 2210.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e6f8fe6a.d80188",
+    "id": "6dd4b7bc.60078",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4970.517288208008,
-    "y": 2212.9070587158203,
-    "z": "294b5e8a.041612",
+    "x": 4978.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fdc72134.67c23"
+        "f825fb77.fb7bc8"
       ]
     ]
   },
   {
-    "id": "fdc72134.67c23",
+    "id": "f825fb77.fb7bc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5128.517288208008,
-    "y": 2212.9070587158203,
-    "z": "294b5e8a.041612",
+    "x": 5136.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "be11f8e.1056f08"
+        "aa2ab587.72eca"
       ]
     ]
   },
   {
-    "id": "be11f8e.1056f08",
+    "id": "aa2ab587.72eca",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5335.517288208008,
-    "y": 2212.9070587158203,
-    "z": "294b5e8a.041612",
+    "x": 5343.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8905f8e1.68af1",
+    "id": "5ec77bbd.698654",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4838.900131225586,
-    "y": 1891.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4846.900131225586,
+    "y": 1846.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ca38006f.4cfdd"
+        "ef66532c.d6746"
       ]
     ]
   },
   {
-    "id": "ca38006f.4cfdd",
+    "id": "ef66532c.d6746",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5015.900131225586,
-    "y": 1883.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5023.900131225586,
+    "y": 1838.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9fddc1a7.528c8",
-        "516ef3bb.d53aec"
+        "f7a2f11b.7a291",
+        "d2b30e12.01e548"
       ]
     ]
   },
   {
-    "id": "cff6dd9b.8cbec",
+    "id": "b056f70a.5ef0e",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4440.900131225586,
-    "y": 1887.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4448.900131225586,
+    "y": 1842.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4e481827.26cf7"
+        "658c9b9.fce64e4"
       ]
     ]
   },
   {
-    "id": "4e481827.26cf7",
+    "id": "658c9b9.fce64e4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4635.900131225586,
-    "y": 1887.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4643.900131225586,
+    "y": 1842.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8905f8e1.68af1",
-        "eb2add71.4c5b38"
+        "5ec77bbd.698654",
+        "d91be682.fd9ed8"
       ]
     ]
   },
   {
-    "id": "516ef3bb.d53aec",
+    "id": "d2b30e12.01e548",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5223.900131225586,
-    "y": 1890.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5231.900131225586,
+    "y": 1845.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8f1e6966.2ed9b",
-        "eb0b97a0.d2554",
-        "8b053235.7e7848"
+        "5cd3941f.991a64",
+        "72be6080.49369",
+        "27b21fad.3c3a98"
       ]
     ]
   },
   {
-    "id": "13674b50.1cc875",
+    "id": "a895224b.6a3d58",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5017.900131225586,
-    "y": 1956.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5025.900131225586,
+    "y": 1911.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fd136ece.b5724"
+        "de5c0fa7.2ddfe8"
       ]
     ]
   },
   {
-    "id": "eb2add71.4c5b38",
+    "id": "d91be682.fd9ed8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4840.900131225586,
-    "y": 1964.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 4848.900131225586,
+    "y": 1919.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "13674b50.1cc875"
+        "a895224b.6a3d58"
       ]
     ]
   },
   {
-    "id": "9fddc1a7.528c8",
+    "id": "f7a2f11b.7a291",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5253.900131225586,
-    "y": 1838.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5261.900131225586,
+    "y": 1793.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fd136ece.b5724",
+    "id": "de5c0fa7.2ddfe8",
     "type": "set",
     "name": "set domainB ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5252.900131225586,
-    "y": 2080.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5260.900131225586,
+    "y": 2035.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8f1e6966.2ed9b",
+    "id": "5cd3941f.991a64",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5433.900131225586,
-    "y": 1881.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5441.900131225586,
+    "y": 1836.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9db69d63.dc9d08"
+        "2d963acb.7812d6"
       ]
     ]
   },
   {
-    "id": "eb0b97a0.d2554",
+    "id": "72be6080.49369",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5425.900131225586,
-    "y": 1936.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5433.900131225586,
+    "y": 1891.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c57fd560.6db4a"
+        "7809e6f0.3ba7a"
       ]
     ]
   },
   {
-    "id": "8b053235.7e7848",
+    "id": "27b21fad.3c3a98",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5430.900131225586,
-    "y": 1993.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5438.900131225586,
+    "y": 1948.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6e911852.3a5e28"
+        "76fc1345.ebf534"
       ]
     ]
   },
   {
-    "id": "6e911852.3a5e28",
+    "id": "76fc1345.ebf534",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5582.900131225586,
-    "y": 1994.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5590.900131225586,
+    "y": 1949.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c57fd560.6db4a",
+    "id": "7809e6f0.3ba7a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5593.900131225586,
-    "y": 1939.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5601.900131225586,
+    "y": 1894.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9db69d63.dc9d08",
+    "id": "2d963acb.7812d6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5578.282455444336,
-    "y": 1879.222427368164,
-    "z": "294b5e8a.041612",
+    "x": 5586.282455444336,
+    "y": 1834.222427368164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e6169acb.b321e8"
+        "3e96d581.6be972"
       ]
     ]
   },
   {
-    "id": "e6169acb.b321e8",
+    "id": "3e96d581.6be972",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5792.900131225586,
-    "y": 1875.5667572021484,
-    "z": "294b5e8a.041612",
+    "x": 5800.900131225586,
+    "y": 1830.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c49ed897.0159e8",
+    "id": "a62852b2.29136",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3277.566635131836,
-    "y": 1694.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 3285.566635131836,
+    "y": 1649.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "758e6e49.b62098",
+    "id": "906a6d5d.cfc198",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4573.566635131836,
-    "y": 668.5666351318359,
-    "z": "294b5e8a.041612",
+    "x": 4581.566635131836,
+    "y": 623.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ebf6202d.cf95a8",
+    "id": "c5fcfc8e.70af78",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4583.566665649414,
-    "y": 864.5666656494141,
-    "z": "294b5e8a.041612",
+    "x": 4591.566665649414,
+    "y": 819.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9d2ec307.fb07b8",
+    "id": "e4c9b14e.e493e",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3280.566604614258,
-    "y": 2202.566604614258,
-    "z": "294b5e8a.041612",
+    "x": 3288.566604614258,
+    "y": 2157.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c81a19d9.9b256",
+    "id": "a5e91f89.51e28",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3417.566665649414,
-    "y": 2858.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3425.566665649414,
+    "y": 2813.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b5b402c1.c35e88",
+    "id": "6a1545ce.c6f074",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3294.566665649414,
-    "y": 2968.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3302.566665649414,
+    "y": 2923.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1932a37.6a327dd",
-        "e9120928.0c2298"
+        "2a58524.cf6ab2e",
+        "b22f43e3.b228e"
       ]
     ]
   },
   {
-    "id": "1932a37.6a327dd",
+    "id": "2a58524.cf6ab2e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3478.566665649414,
-    "y": 2947.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3486.566665649414,
+    "y": 2902.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "82607164.646368"
+        "1fd47368.eaee3d"
       ]
     ]
   },
   {
-    "id": "e9120928.0c2298",
+    "id": "b22f43e3.b228e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3370.566665649414,
-    "y": 5125.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3378.566665649414,
+    "y": 5080.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ff313408.b74908"
+        "bb1800d1.b22838"
       ]
     ]
   },
   {
-    "id": "ff313408.b74908",
+    "id": "bb1800d1.b22838",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3525.566665649414,
-    "y": 5118.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3533.566665649414,
+    "y": 5073.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "172df7ad.1d8918",
-        "e9491637.d51c9",
-        "ed589f33.dee34",
-        "8bbbb496.3df16",
-        "581d9366.e6ee44",
-        "f0668881.7d6d6"
+        "eb692208.605d48",
+        "fa1a129b.8e1e58",
+        "8f8ab353.277fd8",
+        "e967635e.d5f898",
+        "a7e951fd.34174",
+        "147222b6.72d4a5"
       ]
     ]
   },
   {
-    "id": "82607164.646368",
+    "id": "1fd47368.eaee3d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3621.566665649414,
-    "y": 2947.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3629.566665649414,
+    "y": 2902.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a3d597a8.021388",
-        "2f89ad50.333c2a",
-        "7f37398e.ac4788",
-        "c4c44808.41f1d8",
-        "7f311072.1019e",
-        "a4b5361a.3a19d8",
-        "22f4d985.fe3c1e",
-        "dc9eeea6.2c8698",
-        "7a27d008.22f4d",
-        "7fc66b60.eeacbc",
-        "4cc13ef6.adae78",
-        "19fd1bdb.1b78e4",
-        "d873f718.81f988",
-        "cea863c0.4ccb38",
-        "6825a3b9.0c4a74",
-        "97368f95.9c3c68",
-        "550c2be9.9018d4",
-        "540352c5.31c62c",
-        "87e2b691.2d12d8",
-        "25259a32.c04fe6",
-        "b87e18c5.0db5e8",
-        "88b90ca8.e250c"
+        "13be4810.27374",
+        "2088078d.cb1e2",
+        "e3bae41.89a4a98",
+        "ed9405a6.bcc818",
+        "fe194fc5.986bf",
+        "c94ba2a6.6d9dc",
+        "49793ec.cd6ce4",
+        "5e8a3143.8db73",
+        "faf103f5.4614f8",
+        "88431892.8e89b8",
+        "cac051ff.1079b",
+        "8ab931f2.10742",
+        "38387e07.eee06a",
+        "c16c558d.bd7fa8",
+        "773efcf1.a16054",
+        "4610b0f7.2e9108",
+        "9860b974.593a3",
+        "e82d41b7.567df",
+        "763bc2b5.d71f9c",
+        "3cc87f7.3864a",
+        "5fefabc6.f62f5c",
+        "dbd95dbb.cf097"
       ]
     ]
   },
   {
-    "id": "7a27d008.22f4d",
+    "id": "faf103f5.4614f8",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainB",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3931.566665649414,
-    "y": 3262.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3939.566665649414,
+    "y": 3217.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a3d597a8.021388",
+    "id": "13be4810.27374",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3879.566665649414,
-    "y": 3304.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3887.566665649414,
+    "y": 3259.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f89ad50.333c2a",
+    "id": "2088078d.cb1e2",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 4008.566665649414,
-    "y": 3346.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4016.566665649414,
+    "y": 3301.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "568e89f6.76041",
+    "id": "c56513f7.9839c8",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3854.566665649414,
-    "y": 3221.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3862.566665649414,
+    "y": 3176.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cfc92e2e.d4332",
+    "id": "cb0612e7.fab918",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 4379.566665649414,
-    "y": 3742.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4387.566665649414,
+    "y": 3697.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7f37398e.ac4788",
+    "id": "e3bae41.89a4a98",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3943.566665649414,
-    "y": 3781.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3951.566665649414,
+    "y": 3736.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c4c44808.41f1d8",
+    "id": "ed9405a6.bcc818",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3891.566665649414,
-    "y": 3832.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3899.566665649414,
+    "y": 3787.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "7f311072.1019e",
+    "id": "fe194fc5.986bf",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 4027.566665649414,
-    "y": 3879.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4035.566665649414,
+    "y": 3834.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b73302ea.6b3c9",
+    "id": "3a844032.bf9ac",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3884.566665649414,
-    "y": 3741.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3892.566665649414,
+    "y": 3696.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f06d4892.086d48",
+    "id": "debaf07d.db6d5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4314.566665649414,
-    "y": 3938.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4322.566665649414,
+    "y": 3893.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a4b5361a.3a19d8",
+    "id": "c94ba2a6.6d9dc",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3905.566665649414,
-    "y": 3985.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3913.566665649414,
+    "y": 3940.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7c79fc80.066eb4",
-        "c371f5b2.5890b8",
-        "8674a08a.891028"
+        "34b4bb6d.84f2ec",
+        "39b05e8d.991162",
+        "b7823394.4e1968"
       ]
     ]
   },
   {
-    "id": "7c79fc80.066eb4",
+    "id": "34b4bb6d.84f2ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4152.566665649414,
-    "y": 3939.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4160.566665649414,
+    "y": 3894.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f06d4892.086d48"
+        "debaf07d.db6d5"
       ]
     ]
   },
   {
-    "id": "c371f5b2.5890b8",
+    "id": "39b05e8d.991162",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4153.057632446289,
-    "y": 3985.1407012939453,
-    "z": "294b5e8a.041612",
+    "x": 4161.057632446289,
+    "y": 3940.1407012939453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f874dece.70a19"
+        "483dd1d6.aa392"
       ]
     ]
   },
   {
-    "id": "8674a08a.891028",
+    "id": "b7823394.4e1968",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4150.566665649414,
-    "y": 4028.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4158.566665649414,
+    "y": 3983.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "395b0fd4.a6a4c"
+        "59b157ce.93edc"
       ]
     ]
   },
   {
-    "id": "f874dece.70a19",
+    "id": "483dd1d6.aa392",
     "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": 4315.629043579102,
-    "y": 3985.4264373779297,
-    "z": "294b5e8a.041612",
+    "x": 4323.629043579102,
+    "y": 3940.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "395b0fd4.a6a4c",
+    "id": "59b157ce.93edc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4319.566665649414,
-    "y": 4029.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4327.566665649414,
+    "y": 3984.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6825a3b9.0c4a74",
+    "id": "773efcf1.a16054",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3959.566665649414,
-    "y": 4327.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3967.566665649414,
+    "y": 4282.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "97368f95.9c3c68",
+    "id": "4610b0f7.2e9108",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3962.566665649414,
-    "y": 4372.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3970.566665649414,
+    "y": 4327.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "540352c5.31c62c",
+    "id": "e82d41b7.567df",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3954.566665649414,
-    "y": 4100.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3962.566665649414,
+    "y": 4055.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "87e2b691.2d12d8",
+    "id": "763bc2b5.d71f9c",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3956.566665649414,
-    "y": 4147.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3964.566665649414,
+    "y": 4102.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "de9883f2.40e1e",
+    "id": "e3efee4c.cbd228",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3875.566665649414,
-    "y": 4280.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3883.566665649414,
+    "y": 4235.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8e94a286.9bf3d",
+    "id": "a86d756f.b96748",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4485.566665649414,
-    "y": 4946.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4493.566665649414,
+    "y": 4901.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "172df7ad.1d8918",
+    "id": "eb692208.605d48",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3740.566665649414,
-    "y": 5099.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3748.566665649414,
+    "y": 5054.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "42ddce9e.8ae7c",
-        "527e3f0b.1dc1d"
+        "35961804.034dd",
+        "1c6960fb.af77c7"
       ]
     ]
   },
   {
-    "id": "527e3f0b.1dc1d",
+    "id": "1c6960fb.af77c7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3912.566665649414,
-    "y": 5096.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3920.566665649414,
+    "y": 5051.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7bd89115.7af5d"
+        "44ac8602.f7b438"
       ]
     ]
   },
   {
-    "id": "42ddce9e.8ae7c",
+    "id": "35961804.034dd",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3864.566665649414,
-    "y": 5943.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3872.566665649414,
+    "y": 5898.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ba444b0.6d090b8"
+        "e66ef561.f9598"
       ]
     ]
   },
   {
-    "id": "678feee9.54f5e",
+    "id": "a7546f8d.e642f8",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3925.566665649414,
-    "y": 5066.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3933.566665649414,
+    "y": 5021.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f4c6dae7.f846f8",
+    "id": "7377305c.6344e",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3935.566665649414,
-    "y": 5901.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3943.566665649414,
+    "y": 5856.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "22f4d985.fe3c1e",
+    "id": "49793ec.cd6ce4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3958.566665649414,
-    "y": 4475.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3966.566665649414,
+    "y": 4430.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "7bd89115.7af5d",
+    "id": "44ac8602.f7b438",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4088.566665649414,
-    "y": 5098.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4096.566665649414,
+    "y": 5053.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a830956d.47074",
-        "1755eaf4.354305",
-        "bc42d413.82595",
-        "e6e246b3.ed891",
-        "ea96eb7.ae6d798",
-        "64dc9cdb.f55c8c",
-        "8e94a286.9bf3d",
-        "f715ac9f.9b32b8",
-        "79d51ab0.5a125c"
+        "f2639d5b.9b3268",
+        "eb43383.cb911c8",
+        "b431bc46.f09eb8",
+        "3f007800.f3335",
+        "6651db46.728784",
+        "ec10a332.513d58",
+        "a86d756f.b96748",
+        "128b476.c3c24b9",
+        "b1e27ce1.629f7"
       ]
     ]
   },
   {
-    "id": "979e33e8.311e38",
+    "id": "3a4a9e77.4fc502",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5533.566665649414,
-    "y": 4571.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5541.566665649414,
+    "y": 4526.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a830956d.47074",
+    "id": "f2639d5b.9b3268",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4466.566665649414,
-    "y": 5601.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4474.566665649414,
+    "y": 5556.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "dc9eeea6.2c8698",
+    "id": "5e8a3143.8db73",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3937.566665649414,
-    "y": 3475.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3945.566665649414,
+    "y": 3430.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "7fc66b60.eeacbc",
+    "id": "88431892.8e89b8",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3935.566665649414,
-    "y": 2932.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3943.566665649414,
+    "y": 2887.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "4cc13ef6.adae78",
+    "id": "cac051ff.1079b",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3883.566665649414,
-    "y": 2980.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3891.566665649414,
+    "y": 2935.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "19fd1bdb.1b78e4",
+    "id": "8ab931f2.10742",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 4011.566665649414,
-    "y": 3027.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4019.566665649414,
+    "y": 2982.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "49213484.6d2684",
+    "id": "be22c48f.b88288",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3848.566665649414,
-    "y": 2890.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3856.566665649414,
+    "y": 2845.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d873f718.81f988",
+    "id": "38387e07.eee06a",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3845.566665649414,
-    "y": 3118.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3853.566665649414,
+    "y": 3073.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "cea863c0.4ccb38",
+    "id": "c16c558d.bd7fa8",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3938.566665649414,
-    "y": 3171.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3946.566665649414,
+    "y": 3126.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a16772c.f0d08",
+    "id": "8249248d.fd861",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3829.566665649414,
-    "y": 3074.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3837.566665649414,
+    "y": 3029.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d8aa6375.55f12",
+    "id": "8a8f5ba9.d4da6",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3833.566665649414,
-    "y": 3390.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3841.566665649414,
+    "y": 3345.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e6e246b3.ed891",
+    "id": "3f007800.f3335",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4402.566665649414,
-    "y": 4579.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4410.566665649414,
+    "y": 4534.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "546f5300.a4bc44",
+    "id": "5bce380a.32d878",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4386.566665649414,
-    "y": 4535.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4394.566665649414,
+    "y": 4490.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b36d849f.6b142",
+    "id": "1b090d31.1314e3",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5133.566665649414,
-    "y": 4566.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5141.566665649414,
+    "y": 4521.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "df003672.bddd2",
+    "id": "c30363c7.dd0dc",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5220.566665649414,
-    "y": 4608.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5228.566665649414,
+    "y": 4563.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "dbb46179.c47f78",
+    "id": "10271018.94b4f8",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5168.566665649414,
-    "y": 4656.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5176.566665649414,
+    "y": 4611.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "837adbb2.1c01e8",
+    "id": "285754a8.44159c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5296.566665649414,
-    "y": 4703.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5304.566665649414,
+    "y": 4658.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "64dc9cdb.f55c8c",
+    "id": "ec10a332.513d58",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4473.566665649414,
-    "y": 4988.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4481.566665649414,
+    "y": 4943.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f767aa90.80364",
+    "id": "572f6814.fa386",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4456.566665649414,
-    "y": 5050.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4464.566665649414,
+    "y": 5005.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1755eaf4.354305",
+    "id": "eb43383.cb911c8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4567.566665649414,
-    "y": 5092.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4575.566665649414,
+    "y": 5047.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "4953b8d7.b454c8",
+    "id": "8c58cbc3.7f4b88",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5015.566665649414,
-    "y": 5145.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5023.566665649414,
+    "y": 5100.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b4d97863.c15da",
+    "id": "be5aff94.f7d12",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4325.566665649414,
-    "y": 5843.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4333.566665649414,
+    "y": 5798.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d715f85a.00ec7",
+    "id": "526f34d0.18befc",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />",
     "comments": "",
     "outputs": 1,
-    "x": 4223.566665649414,
-    "y": 5792.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4231.566665649414,
+    "y": 5747.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5114dbce.799f0c",
+    "id": "6826024b.ca723c",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4207.566665649414,
-    "y": 5748.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4215.566665649414,
+    "y": 5703.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a495cbe2.05f3",
+    "id": "be0ba193.2dd698",
     "type": "save",
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4993.566665649414,
-    "y": 6005.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5001.566665649414,
+    "y": 5960.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "bc42d413.82595",
+    "id": "b431bc46.f09eb8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4394.566665649414,
-    "y": 5149.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4402.566665649414,
+    "y": 5104.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5a8de4b.cef309c",
-        "99b44375.9d0098"
+        "baf822c4.3f205",
+        "32a48883.ef2b98"
       ]
     ]
   },
   {
-    "id": "5a8de4b.cef309c",
+    "id": "baf822c4.3f205",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4605.566665649414,
-    "y": 5149.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4613.566665649414,
+    "y": 5104.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "41a866cb.6d5e88"
+        "58c9a296.a42094"
       ]
     ]
   },
   {
-    "id": "41a866cb.6d5e88",
+    "id": "58c9a296.a42094",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4761.566665649414,
-    "y": 5145.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4769.566665649414,
+    "y": 5100.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4953b8d7.b454c8",
-        "5f4b3cc4.eb62f4",
-        "76c11af1.9e9b94"
+        "8c58cbc3.7f4b88",
+        "3aab431e.930194",
+        "c5e59db3.c67ea"
       ]
     ]
   },
   {
-    "id": "99b44375.9d0098",
+    "id": "32a48883.ef2b98",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4601.566665649414,
-    "y": 5197.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4609.566665649414,
+    "y": 5152.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c40ddff0.38613"
+        "255e5d4d.31482a"
       ]
     ]
   },
   {
-    "id": "c40ddff0.38613",
+    "id": "255e5d4d.31482a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 4749.566665649414,
-    "y": 5192.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4757.566665649414,
+    "y": 5147.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e8bdf848.077f2",
+    "id": "3647078f.866d7",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5257.566665649414,
-    "y": 4774.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5265.566665649414,
+    "y": 4729.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b668059.1f482",
+    "id": "79257077.5f1ff8",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2423.566665649414,
-    "y": 185.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2431.566665649414,
+    "y": 140.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "989a0e11.127538",
+    "id": "8a55fb57.dfc438",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 2357.566665649414,
-    "y": 221.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2365.566665649414,
+    "y": 176.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e2d9aece.1465f",
+    "id": "d0423030.a4fb7",
     "type": "comment",
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
     "info": "",
     "comments": "",
-    "x": 2542.566665649414,
-    "y": 148.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 2550.566665649414,
+    "y": 103.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8228476b.dfc93",
+    "id": "fad64a40.999cd8",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 4292.566665649414,
-    "y": 5909.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4300.566665649414,
+    "y": 5864.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "394125b3.b0b57a",
+    "id": "1f999717.41db99",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4425.566665649414,
-    "y": 5957.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4433.566665649414,
+    "y": 5912.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "64250c00.f41444",
+    "id": "c52167d8.94938",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4244.566665649414,
-    "y": 6015.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4252.566665649414,
+    "y": 5970.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "24759095.ee144",
-        "cef50f43.3e9f48"
+        "19e438e0.03d147",
+        "34d88bae.811d0c"
       ]
     ]
   },
   {
-    "id": "24759095.ee144",
+    "id": "19e438e0.03d147",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4437.566665649414,
-    "y": 6016.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4445.566665649414,
+    "y": 5971.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c0599a44.570328"
+        "41319fcd.d8b348"
       ]
     ]
   },
   {
-    "id": "c0599a44.570328",
+    "id": "41319fcd.d8b348",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4593.566665649414,
-    "y": 6013.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4601.566665649414,
+    "y": 5968.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cef50f43.3e9f48",
+    "id": "34d88bae.811d0c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4441.566665649414,
-    "y": 6060.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4449.566665649414,
+    "y": 6015.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2c2e6801.1f5998"
+        "9cc4dc7d.174798"
       ]
     ]
   },
   {
-    "id": "2c2e6801.1f5998",
+    "id": "9cc4dc7d.174798",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4580.566665649414,
-    "y": 6055.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4588.566665649414,
+    "y": 6010.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a495cbe2.05f3",
-        "d341cf2c.6ddc78",
-        "882a079d.0537c8",
-        "9acad1b0.c8f3c8",
-        "1591d847.9e7b3",
-        "2e348bab.75e0fc",
-        "3c4d6cf1.e2588c",
-        "cf206ffb.cf7668",
-        "5a9ba33a.7d1a8c",
-        "68c1a73b.58dcd8",
-        "221756d1.77b252",
-        "6b274a0f.281994"
+        "be0ba193.2dd698",
+        "9b687ead.d5262",
+        "bb8d3610.613d68",
+        "89f249f3.3e5608",
+        "1d656b5f.37186d",
+        "90bf2cc6.ca2d58",
+        "517a964c.5fa06",
+        "c8b3b99a.24ee1",
+        "2487bbac.e2018c",
+        "203e33ee.d272e4",
+        "3c1017d1.449bb",
+        "21e17170.9d1c4e"
       ]
     ]
   },
   {
-    "id": "3c4d6cf1.e2588c",
+    "id": "517a964c.5fa06",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4777.566665649414,
-    "y": 6734.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4785.566665649414,
+    "y": 6689.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f71173d.2556e9",
-        "36d425a2.cca582",
-        "63e9e58.35d851c"
+        "f455e87a.bb05c8",
+        "dc467c76.6e0b1",
+        "26412110.73f856"
       ]
     ]
   },
   {
-    "id": "f71173d.2556e9",
+    "id": "f455e87a.bb05c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4982.566665649414,
-    "y": 6731.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4990.566665649414,
+    "y": 6686.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "211a75a9.b19e7a"
+        "8ff8217a.525ad8"
       ]
     ]
   },
   {
-    "id": "36d425a2.cca582",
+    "id": "dc467c76.6e0b1",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4966.057632446289,
-    "y": 6793.140701293945,
-    "z": "294b5e8a.041612",
+    "x": 4974.057632446289,
+    "y": 6748.140701293945,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2ef14bb4.55e2cc"
+        "2b587a1.cfe3f86"
       ]
     ]
   },
   {
-    "id": "63e9e58.35d851c",
+    "id": "26412110.73f856",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4963.566665649414,
-    "y": 6836.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4971.566665649414,
+    "y": 6791.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "61cb6aef.0faa54"
+        "b747b55e.88ecf8"
       ]
     ]
   },
   {
-    "id": "211a75a9.b19e7a",
+    "id": "8ff8217a.525ad8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5138.566665649414,
-    "y": 6745.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5146.566665649414,
+    "y": 6700.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1dafef09.17b7d9"
+        "8429b279.d4cdf"
       ]
     ]
   },
   {
-    "id": "2ef14bb4.55e2cc",
+    "id": "2b587a1.cfe3f86",
     "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": 5128.629043579102,
-    "y": 6793.42643737793,
-    "z": "294b5e8a.041612",
+    "x": 5136.629043579102,
+    "y": 6748.42643737793,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "61cb6aef.0faa54",
+    "id": "b747b55e.88ecf8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5130.566665649414,
-    "y": 6835.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5138.566665649414,
+    "y": 6790.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1dafef09.17b7d9",
+    "id": "8429b279.d4cdf",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5385.566665649414,
-    "y": 6742.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5393.566665649414,
+    "y": 6697.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "33d48bc3.4a3004"
+        "1ddbd038.9357b"
       ]
     ]
   },
   {
-    "id": "33d48bc3.4a3004",
+    "id": "1ddbd038.9357b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5622.566665649414,
-    "y": 6738.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5630.566665649414,
+    "y": 6693.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "509c6355.839cf4"
+        "7922b60b.c6e31"
       ]
     ]
   },
   {
-    "id": "9a8b6da5.4a6238",
+    "id": "e0649c96.67ff88",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5865.566665649414,
-    "y": 6710.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5873.566665649414,
+    "y": 6665.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4704615c.3c69f",
-        "3a6fe540.e42ee2"
+        "6697bde5.6a73ec",
+        "f1cd44ef.865458"
       ]
     ]
   },
   {
-    "id": "4704615c.3c69f",
+    "id": "6697bde5.6a73ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6070.566665649414,
-    "y": 6730.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 6078.566665649414,
+    "y": 6685.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "509c6355.839cf4"
+        "7922b60b.c6e31"
       ]
     ]
   },
   {
-    "id": "3a6fe540.e42ee2",
+    "id": "f1cd44ef.865458",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6069.566665649414,
-    "y": 6683.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 6077.566665649414,
+    "y": 6638.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "509c6355.839cf4",
+    "id": "7922b60b.c6e31",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4813.566665649414,
-    "y": 7005.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4821.566665649414,
+    "y": 6960.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "867fbf45.6b76e8"
+        "b0b5d457.a97bd"
       ]
     ]
   },
   {
-    "id": "b664359c.e37a3",
+    "id": "1fa90257.6a5f2e",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 6275.566635131836,
-    "y": 6943.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 6283.566635131836,
+    "y": 6898.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "125d4567.492113",
+    "id": "a2de4936.eeff58",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4875.566665649414,
-    "y": 6681.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4883.566665649414,
+    "y": 6636.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2e348bab.75e0fc",
+    "id": "90bf2cc6.ca2d58",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4757.566665649414,
-    "y": 6569.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4765.566665649414,
+    "y": 6524.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cf763643.011b",
+    "id": "917753a8.ea741",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5102.566665649414,
-    "y": 6400.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5110.566665649414,
+    "y": 6355.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e8f56973.27478"
+        "ddf721ac.b7eef8"
       ]
     ]
   },
   {
-    "id": "e8f56973.27478",
+    "id": "ddf721ac.b7eef8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5322.566665649414,
-    "y": 6406.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5330.566665649414,
+    "y": 6361.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fde5a354.539f28"
+        "ff49769d.1bd52"
       ]
     ]
   },
   {
-    "id": "fde5a354.539f28",
+    "id": "ff49769d.1bd52",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5509.566665649414,
-    "y": 6366.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5517.566665649414,
+    "y": 6321.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "575e4bf2.eff614"
+        "4e069c0d.3968f4"
       ]
     ]
   },
   {
-    "id": "575e4bf2.eff614",
+    "id": "4e069c0d.3968f4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5701.566665649414,
-    "y": 6369.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5709.566665649414,
+    "y": 6324.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d993f92.1703888"
+        "2305c4b2.be932c"
       ]
     ]
   },
   {
-    "id": "d993f92.1703888",
+    "id": "2305c4b2.be932c",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5910.566665649414,
-    "y": 6367.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5918.566665649414,
+    "y": 6322.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cf206ffb.cf7668",
+    "id": "c8b3b99a.24ee1",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4809.566665649414,
-    "y": 6394.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4817.566665649414,
+    "y": 6349.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cf763643.011b"
+        "917753a8.ea741"
       ]
     ]
   },
   {
-    "id": "882a079d.0537c8",
+    "id": "bb8d3610.613d68",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4817.566665649414,
-    "y": 6287.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4825.566665649414,
+    "y": 6242.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bc620ade.df0f58",
-        "6623a49b.f6c65c",
-        "19b34b3d.8c8655"
+        "ae57a65a.f0c818",
+        "d5c36a0.e7a9398",
+        "2780984c.5a15a"
       ]
     ]
   },
   {
-    "id": "bc620ade.df0f58",
+    "id": "ae57a65a.f0c818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5053.566665649414,
-    "y": 6270.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5061.566665649414,
+    "y": 6225.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6623a49b.f6c65c",
+    "id": "d5c36a0.e7a9398",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5050.566665649414,
-    "y": 6311.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5058.566665649414,
+    "y": 6266.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "19b34b3d.8c8655",
+    "id": "2780984c.5a15a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5064.566665649414,
-    "y": 6351.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5072.566665649414,
+    "y": 6306.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "9acad1b0.c8f3c8",
+    "id": "89f249f3.3e5608",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4753.566665649414,
-    "y": 6446.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4761.566665649414,
+    "y": 6401.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1591d847.9e7b3",
+    "id": "1d656b5f.37186d",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4761.566665649414,
-    "y": 6504.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4769.566665649414,
+    "y": 6459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d341cf2c.6ddc78",
+    "id": "9b687ead.d5262",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4766.566665649414,
-    "y": 6244.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4774.566665649414,
+    "y": 6199.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2fabd91.b08d0a6",
+    "id": "201d95ad.f7c612",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4881.566665649414,
-    "y": 6196.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4889.566665649414,
+    "y": 6151.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "867fbf45.6b76e8",
+    "id": "b0b5d457.a97bd",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5056.566665649414,
-    "y": 7002.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5064.566665649414,
+    "y": 6957.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ca20f18b.d4eba8",
-        "a546871e.5bfa7"
+        "46f9fbf7.fbe6cc",
+        "bab2d066.0ad5b"
       ]
     ]
   },
   {
-    "id": "ca20f18b.d4eba8",
+    "id": "46f9fbf7.fbe6cc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5285.566665649414,
-    "y": 6979.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5293.566665649414,
+    "y": 6934.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4274d693.44e7"
+        "66be0922.f0399"
       ]
     ]
   },
   {
-    "id": "a546871e.5bfa7",
+    "id": "bab2d066.0ad5b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5285.566665649414,
-    "y": 7028.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5293.566665649414,
+    "y": 6983.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d07c8b0.2ee89",
+    "id": "646b562c.1751a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6018.566635131836,
-    "y": 7034.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 6026.566635131836,
+    "y": 6989.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "90c25785.3a5d5",
-        "b664359c.e37a3",
-        "9e3c844f.310898"
+        "898afc0c.eb00d8",
+        "1fa90257.6a5f2e",
+        "9d2bedee.a23cf"
       ]
     ]
   },
   {
-    "id": "8461f132.9df9d8",
+    "id": "5bb30070.2c2c98",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6403.566635131836,
-    "y": 6997.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 6411.566635131836,
+    "y": 6952.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9e3c844f.310898",
+    "id": "9d2bedee.a23cf",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6373.566635131836,
-    "y": 7057.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 6381.566635131836,
+    "y": 7012.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "90c25785.3a5d5",
+    "id": "898afc0c.eb00d8",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 6280.566635131836,
-    "y": 6885.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 6288.566635131836,
+    "y": 6840.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ba444b0.6d090b8",
+    "id": "e66ef561.f9598",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4016.566665649414,
-    "y": 5942.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4024.566665649414,
+    "y": 5897.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d715f85a.00ec7",
-        "8228476b.dfc93",
-        "394125b3.b0b57a",
-        "64250c00.f41444",
-        "b4d97863.c15da"
+        "526f34d0.18befc",
+        "fad64a40.999cd8",
+        "1f999717.41db99",
+        "c52167d8.94938",
+        "be5aff94.f7d12"
       ]
     ]
   },
   {
-    "id": "c0768f56.37d61",
+    "id": "55c4563d.130918",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4758.566665649414,
-    "y": 6344.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4766.566665649414,
+    "y": 6299.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5a9ba33a.7d1a8c",
+    "id": "2487bbac.e2018c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4886.566665649414,
-    "y": 6086.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4894.566665649414,
+    "y": 6041.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "42948c30.98f5ec",
+    "id": "eef6a242.86b638",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 5023.566665649414,
-    "y": 6036.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5031.566665649414,
+    "y": 5991.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "550c2be9.9018d4",
+    "id": "9860b974.593a3",
     "type": "save",
     "name": "save ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3850.566665649414,
-    "y": 3429.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3858.566665649414,
+    "y": 3384.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "371edf0a.6e17f",
+    "id": "c96fd773.2e2468",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4028.566635131836,
-    "y": 1664.566635131836,
-    "z": "294b5e8a.041612",
+    "x": 4036.566635131836,
+    "y": 1619.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "de567305.4a43d8",
+    "id": "e5b482c4.4ff96",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4007.566604614258,
-    "y": 2176.566604614258,
-    "z": "294b5e8a.041612",
+    "x": 4015.566604614258,
+    "y": 2131.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "25146472.eb3624",
+    "id": "58efc802.973c9",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3842.566665649414,
-    "y": 4050.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3850.566665649414,
+    "y": 4005.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c5539a8b.106aa",
+    "id": "517fe5d1.d6143c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3932.566665649414,
-    "y": 6430.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3940.566665649414,
+    "y": 6385.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e9491637.d51c9",
+    "id": "fa1a129b.8e1e58",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3734.566665649414,
-    "y": 4959.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3742.566665649414,
+    "y": 4914.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ed589f33.dee34",
+    "id": "8f8ab353.277fd8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3867.566665649414,
-    "y": 5007.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3875.566665649414,
+    "y": 4962.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea96eb7.ae6d798",
+    "id": "6651db46.728784",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4413.566665649414,
-    "y": 4635.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4421.566665649414,
+    "y": 4590.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a8f10916.be28b",
-        "f59d19a8.d9c4d8"
+        "894780c2.49e69",
+        "859a7332.ec6f6"
       ]
     ]
   },
   {
-    "id": "a8f10916.be28b",
+    "id": "894780c2.49e69",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4606.566665649414,
-    "y": 4636.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4614.566665649414,
+    "y": 4591.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f728dec2.62b3a"
+        "ba88b5a5.1ae688"
       ]
     ]
   },
   {
-    "id": "f59d19a8.d9c4d8",
+    "id": "859a7332.ec6f6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4610.566665649414,
-    "y": 4680.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4618.566665649414,
+    "y": 4635.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c09bd16a.0b32d"
+        "99dc491a.da7278"
       ]
     ]
   },
   {
-    "id": "c09bd16a.0b32d",
+    "id": "99dc491a.da7278",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4749.566665649414,
-    "y": 4675.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4757.566665649414,
+    "y": 4630.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d9114bfc.f7bce",
-        "6c2541da.5d16b8",
-        "b22f3c73.35c508"
+        "8cf9ac68.b6fb08",
+        "b04660b8.eae2",
+        "fb45e770.b6fb4"
       ]
     ]
   },
   {
-    "id": "f728dec2.62b3a",
+    "id": "ba88b5a5.1ae688",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4749.566665649414,
-    "y": 4632.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4757.566665649414,
+    "y": 4587.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "df003672.bddd2",
-        "dbb46179.c47f78",
-        "837adbb2.1c01e8",
-        "e8bdf848.077f2"
+        "c30363c7.dd0dc",
+        "10271018.94b4f8",
+        "285754a8.44159c",
+        "3647078f.866d7"
       ]
     ]
   },
   {
-    "id": "d9114bfc.f7bce",
+    "id": "8cf9ac68.b6fb08",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5151.566909790039,
-    "y": 4897.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5159.566909790039,
+    "y": 4852.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "430a9d16.e4affc",
+    "id": "f52716f7.92c318",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5158.566909790039,
-    "y": 4851.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5166.566909790039,
+    "y": 4806.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "68c1a73b.58dcd8",
+    "id": "203e33ee.d272e4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4948.566665649414,
-    "y": 6630.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4956.566665649414,
+    "y": 6585.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6c2541da.5d16b8",
+    "id": "b04660b8.eae2",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5269.566909790039,
-    "y": 4939.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5277.566909790039,
+    "y": 4894.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5f4b3cc4.eb62f4",
+    "id": "3aab431e.930194",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5144.566665649414,
-    "y": 5197.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5152.566665649414,
+    "y": 5152.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7484b6a.1b27e8",
+    "id": "b6e6466d.f535c8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3489.566665649414,
-    "y": 4530.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3497.566665649414,
+    "y": 4485.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8eb23d5.90166c",
+    "id": "eb0222bd.49b5a",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4011.566665649414,
-    "y": 4631.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4019.566665649414,
+    "y": 4586.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8bbbb496.3df16",
+    "id": "e967635e.d5f898",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3468.566665649414,
-    "y": 4574.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3476.566665649414,
+    "y": 4529.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a18c125a.02e14",
-        "7f2705d6.db1694",
-        "a9eb2c91.698e38"
+        "a0645295.c076d8",
+        "9cfd1461.a062b8",
+        "c3fd0eeb.1191a"
       ]
     ]
   },
   {
-    "id": "7f2705d6.db1694",
+    "id": "9cfd1461.a062b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3657.057632446289,
-    "y": 4543.140884399414,
-    "z": "294b5e8a.041612",
+    "x": 3665.057632446289,
+    "y": 4498.140884399414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2e3353bd.ee574c"
+        "763a574e.7131"
       ]
     ]
   },
   {
-    "id": "a9eb2c91.698e38",
+    "id": "c3fd0eeb.1191a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3645.566665649414,
-    "y": 4582.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3653.566665649414,
+    "y": 4537.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5c8fdc07.865394"
+        "64809ae2.7e048c"
       ]
     ]
   },
   {
-    "id": "2e3353bd.ee574c",
+    "id": "763a574e.7131",
     "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": 3816.629165649414,
-    "y": 4541.426528930664,
-    "z": "294b5e8a.041612",
+    "x": 3824.629165649414,
+    "y": 4496.426528930664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5c8fdc07.865394",
+    "id": "64809ae2.7e048c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3806.566665649414,
-    "y": 4583.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3814.566665649414,
+    "y": 4538.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9ccbfbe.3763808",
+    "id": "9a196ab1.500e98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3808.566665649414,
-    "y": 4627.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3816.566665649414,
+    "y": 4582.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b718fb4d.1d2eb",
-        "8eb23d5.90166c"
+        "6eb0cd28.22b8f4",
+        "eb0222bd.49b5a"
       ]
     ]
   },
   {
-    "id": "a18c125a.02e14",
+    "id": "a0645295.c076d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3650.566665649414,
-    "y": 4619.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3658.566665649414,
+    "y": 4574.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9ccbfbe.3763808"
+        "9a196ab1.500e98"
       ]
     ]
   },
   {
-    "id": "b718fb4d.1d2eb",
+    "id": "6eb0cd28.22b8f4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3969.566665649414,
-    "y": 4559.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3977.566665649414,
+    "y": 4514.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "581d9366.e6ee44",
+    "id": "a7e951fd.34174",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3834.566665649414,
-    "y": 4898.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3842.566665649414,
+    "y": 4853.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "3bda63fd.be934c",
+    "id": "a3ce23a7.48a0c8",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5949.449966430664,
-    "y": 6648.449966430664,
-    "z": "294b5e8a.041612",
+    "x": 5957.449966430664,
+    "y": 6603.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b22f3c73.35c508",
+    "id": "fb45e770.b6fb4",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5149.233901977539,
-    "y": 5035.650161743164,
-    "z": "294b5e8a.041612",
+    "x": 5157.233901977539,
+    "y": 4990.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "72bb0449.7c6c4c",
+    "id": "7a5a11e8.fe41c8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5151.450698852539,
-    "y": 4995.449966430664,
-    "z": "294b5e8a.041612",
+    "x": 5159.450698852539,
+    "y": 4950.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "76c11af1.9e9b94",
+    "id": "c5e59db3.c67ea",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5025.233657836914,
-    "y": 5285.650161743164,
-    "z": "294b5e8a.041612",
+    "x": 5033.233657836914,
+    "y": 5240.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "9cb7b649.72fc8",
+    "id": "57dbe634.714a18",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5027.450454711914,
-    "y": 5245.449966430664,
-    "z": "294b5e8a.041612",
+    "x": 5035.450454711914,
+    "y": 5200.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ac700fc2.3e2c98",
+    "id": "aa096a62.a00c18",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5115.033462524414,
-    "y": 5648.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 5123.033462524414,
+    "y": 5603.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "9aeab5a.07483c8",
+    "id": "a1684c9.099dc3",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4942.033462524414,
-    "y": 5705.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 4950.033462524414,
+    "y": 5660.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7adad055.f81858",
-        "1c623aa1.b56e9d"
+        "322ec37b.7f462c",
+        "a4688844.be2738"
       ]
     ]
   },
   {
-    "id": "7adad055.f81858",
+    "id": "322ec37b.7f462c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5153.033462524414,
-    "y": 5705.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 5161.033462524414,
+    "y": 5660.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8b4d22b1.51563"
+        "32e06877.2a572"
       ]
     ]
   },
   {
-    "id": "1c623aa1.b56e9d",
+    "id": "a4688844.be2738",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5149.033462524414,
-    "y": 5753.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 5157.033462524414,
+    "y": 5708.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1d139b8d.b9ffb4"
+        "748c1810.be501"
       ]
     ]
   },
   {
-    "id": "8b4d22b1.51563",
+    "id": "32e06877.2a572",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5309.033462524414,
-    "y": 5701.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 5317.033462524414,
+    "y": 5656.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f5948089.056778",
-        "eda1ec63.f88a8",
-        "116803c1.b8c5c4"
+        "c380fc3b.e6c15",
+        "4e971f2e.5d2078",
+        "7fabceea.e8bd9"
       ]
     ]
   },
   {
-    "id": "1d139b8d.b9ffb4",
+    "id": "748c1810.be501",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5297.033462524414,
-    "y": 5748.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 5305.033462524414,
+    "y": 5703.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fa3077ab.1dba8",
+    "id": "bf0ec53.d08f2b8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5618.917251586914,
-    "y": 5801.966567993164,
-    "z": "294b5e8a.041612",
+    "x": 5626.917251586914,
+    "y": 5756.966567993164,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "116803c1.b8c5c4",
+    "id": "7fabceea.e8bd9",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5622.700454711914,
-    "y": 5840.166763305664,
-    "z": "294b5e8a.041612",
+    "x": 5630.700454711914,
+    "y": 5795.166763305664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "eda1ec63.f88a8",
+    "id": "4e971f2e.5d2078",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5729.033462524414,
-    "y": 5753.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 5737.033462524414,
+    "y": 5708.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f5948089.056778",
+    "id": "c380fc3b.e6c15",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5613.033462524414,
-    "y": 5701.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 5621.033462524414,
+    "y": 5656.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d30afa49.07b758",
+    "id": "ddfb9582.3445a8",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5004.033462524414,
-    "y": 5606.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 5012.033462524414,
+    "y": 5561.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "221756d1.77b252",
+    "id": "3c1017d1.449bb",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4716.366470336914,
-    "y": 5781.083267211914,
-    "z": "294b5e8a.041612",
+    "x": 4724.366470336914,
+    "y": 5736.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ac700fc2.3e2c98",
-        "9aeab5a.07483c8",
-        "986cd5c9.02e9d",
-        "cfe4284f.245dc"
+        "aa096a62.a00c18",
+        "a1684c9.099dc3",
+        "a4cbceb2.4df788",
+        "9c03eaae.aa875"
       ]
     ]
   },
   {
-    "id": "6b274a0f.281994",
+    "id": "21e17170.9d1c4e",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5016.399673461914,
-    "y": 6141.766860961914,
-    "z": "294b5e8a.041612",
+    "x": 5024.399673461914,
+    "y": 6096.766860961914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "9356e875.de45c8",
+    "id": "bfe53aa3.d585a8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5822.683334350586,
-    "y": 6978.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 5830.683334350586,
+    "y": 6933.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "4274d693.44e7",
+    "id": "66be0922.f0399",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5441.683334350586,
-    "y": 6981.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 5449.683334350586,
+    "y": 6936.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9356e875.de45c8",
-        "f4fb32f5.290118",
-        "fc73441.6e16238"
+        "bfe53aa3.d585a8",
+        "f8b29486.7e71d",
+        "bf54edf8.ad3758"
       ]
     ]
   },
   {
-    "id": "f4fb32f5.290118",
+    "id": "f8b29486.7e71d",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5667.683334350586,
-    "y": 7033.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 5675.683334350586,
+    "y": 6988.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7d48e95d.36571"
+        "45d6980.5fa0ee8"
       ]
     ]
   },
   {
-    "id": "7d48e95d.36571",
+    "id": "45d6980.5fa0ee8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5846.683334350586,
-    "y": 7032.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 5854.683334350586,
+    "y": 6987.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d07c8b0.2ee89"
+        "646b562c.1751a8"
       ]
     ]
   },
   {
-    "id": "fc73441.6e16238",
+    "id": "bf54edf8.ad3758",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 5668.683334350586,
-    "y": 6926.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 5676.683334350586,
+    "y": 6881.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c7583bfe.6dbd",
+    "id": "7c0aae65.c25f7",
     "type": "notify",
     "name": "notify",
     "xml": "<notify plugin='' resource='' action='' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2662.683334350586,
-    "y": 975.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 2670.683334350586,
+    "y": 930.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "17e6527f.ea49de",
+    "id": "c9e93381.966988",
     "type": "set",
     "name": "set network-route-three",
     "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
     "comments": "",
-    "x": 3340.683334350586,
-    "y": 751.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 3348.683334350586,
+    "y": 706.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4ef95e12.fd687",
+    "id": "18d11d50.cb3a7b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3556.683334350586,
-    "y": 1079.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3564.683334350586,
+    "y": 1034.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "76cbe80c.f4e188",
+    "id": "e2e500c.35b568",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3552.192398071289,
-    "y": 1122.109390258789,
-    "z": "294b5e8a.041612",
+    "x": 3560.192398071289,
+    "y": 1077.109390258789,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "2e93ec7e.d04c6c",
+    "id": "ac92425e.1b5228",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3556.192367553711,
-    "y": 1170.109359741211,
-    "z": "294b5e8a.041612",
+    "x": 3564.192367553711,
+    "y": 1125.109359741211,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b4c3abcb.bb0aa8"
+        "74bd1e76.c1a798"
       ]
     ]
   },
   {
-    "id": "b4c3abcb.bb0aa8",
+    "id": "74bd1e76.c1a798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3713.683334350586,
-    "y": 1169.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3721.683334350586,
+    "y": 1124.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c59d6859.c80d1"
+        "75cda54f.508c54"
       ]
     ]
   },
   {
-    "id": "c59d6859.c80d1",
+    "id": "75cda54f.508c54",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3883.683364868164,
-    "y": 1172.6834869384766,
-    "z": "294b5e8a.041612",
+    "x": 3891.683364868164,
+    "y": 1127.6834869384766,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b806c285.3c1eb",
-        "1890bb58.2d4ee5",
-        "614f0a7f.a53cf4"
+        "b5759425.3c5bd",
+        "a5689d25.4480b8",
+        "32c4f78e.6013e8"
       ]
     ]
   },
   {
-    "id": "b806c285.3c1eb",
+    "id": "b5759425.3c5bd",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4057.683334350586,
-    "y": 1110.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4065.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "224fa1be.62b94e"
+        "e254226b.74faf"
       ]
     ]
   },
   {
-    "id": "1890bb58.2d4ee5",
+    "id": "a5689d25.4480b8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4059.683334350586,
-    "y": 1164.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4067.683334350586,
+    "y": 1119.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5ec2cf4e.ba2b2"
+        "b214dc3a.ed1eb8"
       ]
     ]
   },
   {
-    "id": "224fa1be.62b94e",
+    "id": "e254226b.74faf",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4185.683334350586,
-    "y": 1110.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4193.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a900cf11.02bcd",
-        "1c2b8eb2.2e6009"
+        "1e63a796.08e87",
+        "c1790587.ac9f08"
       ]
     ]
   },
   {
-    "id": "5ec2cf4e.ba2b2",
+    "id": "b214dc3a.ed1eb8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4188.683334350586,
-    "y": 1163.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4196.683334350586,
+    "y": 1118.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "459af4e0.72f56c",
-        "8371ef21.19884"
+        "ea9630d6.e1db68",
+        "7cd0ca92.870d14"
       ]
     ]
   },
   {
-    "id": "1c2b8eb2.2e6009",
+    "id": "c1790587.ac9f08",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4346.683334350586,
-    "y": 1134.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4354.683334350586,
+    "y": 1089.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "459af4e0.72f56c",
+    "id": "ea9630d6.e1db68",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4363.683334350586,
-    "y": 1176.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4371.683334350586,
+    "y": 1131.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8371ef21.19884",
+    "id": "7cd0ca92.870d14",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4348.683334350586,
-    "y": 1214.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4356.683334350586,
+    "y": 1169.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a900cf11.02bcd",
+    "id": "1e63a796.08e87",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4360.683334350586,
-    "y": 1094.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4368.683334350586,
+    "y": 1049.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f4867be8.a3739",
+    "id": "5b64a8f4.eea95",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4525.683334350586,
-    "y": 1110.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4533.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c22e8ab9.0a6b88",
+    "id": "5fc9799.82ba788",
     "type": "save",
     "name": "get network-route-three from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
     "comments": "",
     "outputs": 1,
-    "x": 3316.683334350586,
-    "y": 1096.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3324.683334350586,
+    "y": 1051.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4ef95e12.fd687",
-        "76cbe80c.f4e188",
-        "2e93ec7e.d04c6c"
+        "18d11d50.cb3a7b",
+        "e2e500c.35b568",
+        "ac92425e.1b5228"
       ]
     ]
   },
   {
-    "id": "614f0a7f.a53cf4",
+    "id": "32c4f78e.6013e8",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4002.683334350586,
-    "y": 1228.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 4010.683334350586,
+    "y": 1183.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7f1b4232.b1cfb4"
+        "e8d5048b.eb9908"
       ]
     ]
   },
   {
-    "id": "7f1b4232.b1cfb4",
+    "id": "e8d5048b.eb9908",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4176.683334350586,
-    "y": 1223.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 4184.683334350586,
+    "y": 1178.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "838abc45.59f7a",
-        "db00c52c.5ed268"
+        "cbdde789.933e38",
+        "ff9c265d.ccb66"
       ]
     ]
   },
   {
-    "id": "db00c52c.5ed268",
+    "id": "ff9c265d.ccb66",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4346.683334350586,
-    "y": 1296.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 4354.683334350586,
+    "y": 1251.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "838abc45.59f7a",
+    "id": "cbdde789.933e38",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4400.683334350586,
-    "y": 1256.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 4408.683334350586,
+    "y": 1211.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ff2b32b5.5b2a08",
+    "id": "fa28f519.9b734",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4514.683334350586,
-    "y": 1281.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 4522.683334350586,
+    "y": 1236.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "56529717.d57cf",
+    "id": "65095290.735c7c",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4073.683334350586,
-    "y": 984.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 4081.683334350586,
+    "y": 939.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ee2de2c6.4f08d8"
+        "6a27287d.2ebf6"
       ]
     ]
   },
   {
-    "id": "ca426e77.b8a868",
+    "id": "d7809ac8.28364",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4417.683334350586,
-    "y": 1052.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 4425.683334350586,
+    "y": 1007.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f04a072d.a1bc78",
+    "id": "38b369ba.8d91fe",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4471.683334350586,
-    "y": 1012.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 4479.683334350586,
+    "y": 967.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "494ac499.527a64",
+    "id": "7d1c2c8b.bd9814",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4615.683334350586,
-    "y": 1041.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 4623.683334350586,
+    "y": 996.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ee2de2c6.4f08d8",
+    "id": "6a27287d.2ebf6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4247.683334350586,
-    "y": 979.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 4255.683334350586,
+    "y": 934.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f04a072d.a1bc78",
-        "ca426e77.b8a868"
+        "38b369ba.8d91fe",
+        "d7809ac8.28364"
       ]
     ]
   },
   {
-    "id": "fbdccf10.5fabc",
+    "id": "b03ebc69.8e68d8",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4133.683334350586,
-    "y": 722.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 4141.683334350586,
+    "y": 677.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b0420846.4df49"
+        "e58f35e3.4b6a2"
       ]
     ]
   },
   {
-    "id": "6f89ab47.26e854",
+    "id": "6a2c136e.692edc",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4477.683334350586,
-    "y": 790.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 4485.683334350586,
+    "y": 745.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bf3e885.5679178",
+    "id": "66ae94b1.018af4",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4531.683334350586,
-    "y": 750.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 4539.683334350586,
+    "y": 705.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fd3136c3.1f9f9",
+    "id": "33be367d.fbce62",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4645.683334350586,
-    "y": 775.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 4653.683334350586,
+    "y": 730.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b0420846.4df49",
+    "id": "e58f35e3.4b6a2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4307.683334350586,
-    "y": 717.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 4315.683334350586,
+    "y": 672.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bf3e885.5679178",
-        "6f89ab47.26e854"
+        "66ae94b1.018af4",
+        "6a2c136e.692edc"
       ]
     ]
   },
   {
-    "id": "d5e167ce.f19998",
+    "id": "64cdb464.83135c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3714.683334350586,
-    "y": 2599.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3722.683334350586,
+    "y": 2554.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "eb74e655.05ff7",
-        "e886ebc1.1661e8"
+        "7a3829d.42a01d8",
+        "d03e5e53.5cee58"
       ]
     ]
   },
   {
-    "id": "47201997.7cc3c",
+    "id": "6e42edd4.58cd0c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3542.016830444336,
-    "y": 2600.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3550.016830444336,
+    "y": 2555.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d5e167ce.f19998"
+        "64cdb464.83135c"
       ]
     ]
   },
   {
-    "id": "164be473.b70384",
+    "id": "b61e07a3.0e4238",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3551.507797241211,
-    "y": 2643.257369995117,
-    "z": "294b5e8a.041612",
+    "x": 3559.507797241211,
+    "y": 2598.257369995117,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "784aa04.7c1dfe",
+    "id": "2df3a08e.41f4c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3540.016830444336,
-    "y": 2689.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3548.016830444336,
+    "y": 2644.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "eb74e655.05ff7",
+    "id": "7a3829d.42a01d8",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4001.016830444336,
-    "y": 2603.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4009.016830444336,
+    "y": 2558.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3f64df6c.c641f8",
-        "e65de275.42f878"
+        "38c64779.e618f",
+        "14f81708.27e459"
       ]
     ]
   },
   {
-    "id": "e65de275.42f878",
+    "id": "14f81708.27e459",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4224.016830444336,
-    "y": 2558.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4232.016830444336,
+    "y": 2513.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "34b4944b.960704"
+        "2753f3be.c9c924"
       ]
     ]
   },
   {
-    "id": "3f64df6c.c641f8",
+    "id": "38c64779.e618f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4226.016830444336,
-    "y": 2622.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4234.016830444336,
+    "y": 2577.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "699d84d7.6602fc"
+        "43ad3093.31a088"
       ]
     ]
   },
   {
-    "id": "9c75cfb6.9dae68",
+    "id": "9fbb56ee.c43378",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3314.016830444336,
-    "y": 2635.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3322.016830444336,
+    "y": 2590.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "47201997.7cc3c",
-        "164be473.b70384",
-        "784aa04.7c1dfe"
+        "6e42edd4.58cd0c",
+        "b61e07a3.0e4238",
+        "2df3a08e.41f4c"
       ]
     ]
   },
   {
-    "id": "23b8fd1e.0cb2fa",
+    "id": "ac1718b4.765b78",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3275.016830444336,
-    "y": 2579.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3283.016830444336,
+    "y": 2534.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "647f2e19.e50158",
+    "id": "7ebd6769.0b5428",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3334.016830444336,
-    "y": 2375.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3342.016830444336,
+    "y": 2330.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5e42c344.eae60c",
-        "af9299b9.b3a958"
+        "2f0a58a8.ee7038",
+        "79cdcb97.546894"
       ]
     ]
   },
   {
-    "id": "af9299b9.b3a958",
+    "id": "79cdcb97.546894",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3557.016830444336,
-    "y": 2361.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3565.016830444336,
+    "y": 2316.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9102a653.17d73"
+        "49eedb67.f00374"
       ]
     ]
   },
   {
-    "id": "5e42c344.eae60c",
+    "id": "2f0a58a8.ee7038",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3559.016830444336,
-    "y": 2394.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3567.016830444336,
+    "y": 2349.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "9102a653.17d73",
+    "id": "49eedb67.f00374",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3705.016830444336,
-    "y": 2354.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3713.016830444336,
+    "y": 2309.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9818833d.58ad9",
-        "288d55d1.6f744a"
+        "f5d93681.391ea",
+        "66937670.413898"
       ]
     ]
   },
   {
-    "id": "9818833d.58ad9",
+    "id": "f5d93681.391ea",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3899.016830444336,
-    "y": 2357.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 3907.016830444336,
+    "y": 2312.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e886ebc1.1661e8",
+    "id": "d03e5e53.5cee58",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3952.016799926758,
-    "y": 2726.683303833008,
-    "z": "294b5e8a.041612",
+    "x": 3960.016799926758,
+    "y": 2681.683303833008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f013a1b2.101138"
+        "1dfcba6a.928896"
       ]
     ]
   },
   {
-    "id": "f013a1b2.101138",
+    "id": "1dfcba6a.928896",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4158.016799926758,
-    "y": 2726.683303833008,
-    "z": "294b5e8a.041612",
+    "x": 4166.016799926758,
+    "y": 2681.683303833008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "386bba62.16259e"
+        "ad7b62a1.1a3de8"
       ]
     ]
   },
   {
-    "id": "288d55d1.6f744a",
+    "id": "66937670.413898",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3921.016830444336,
-    "y": 2425.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 3929.016830444336,
+    "y": 2380.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "50cea31f.42d1c4",
-        "35a7b03.f8d85d",
-        "21702f57.67315"
+        "7e1c1529.6f1464",
+        "e1251115.be77b",
+        "d084db0e.513758"
       ]
     ]
   },
   {
-    "id": "50cea31f.42d1c4",
+    "id": "7e1c1529.6f1464",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4116.516952514648,
-    "y": 2377.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4124.516952514648,
+    "y": 2332.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "295cc726.ea872"
+        "24a5d36d.06630c"
       ]
     ]
   },
   {
-    "id": "35a7b03.f8d85d",
+    "id": "e1251115.be77b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4108.516952514648,
-    "y": 2432.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4116.516952514648,
+    "y": 2387.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2c7fef61.a7451"
+        "e4759099.9196a"
       ]
     ]
   },
   {
-    "id": "21702f57.67315",
+    "id": "d084db0e.513758",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4113.516952514648,
-    "y": 2489.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4121.516952514648,
+    "y": 2444.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9bbdca0e.a0cf58"
+        "68e5ccfb.96ac94"
       ]
     ]
   },
   {
-    "id": "9bbdca0e.a0cf58",
+    "id": "68e5ccfb.96ac94",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4265.516952514648,
-    "y": 2490.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4273.516952514648,
+    "y": 2445.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "295cc726.ea872",
+    "id": "24a5d36d.06630c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4260.899276733398,
-    "y": 2375.339126586914,
-    "z": "294b5e8a.041612",
+    "x": 4268.899276733398,
+    "y": 2330.339126586914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "723c9a0.e71c268"
+        "b2ff1ea.8d4406"
       ]
     ]
   },
   {
-    "id": "9a8ce081.e6446",
+    "id": "387e5bde.fd50e4",
     "type": "set",
     "name": "set SECONDARY-ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
     "comments": "",
-    "x": 3336.683334350586,
-    "y": 2714.683334350586,
-    "z": "294b5e8a.041612",
+    "x": 3344.683334350586,
+    "y": 2669.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c2ddeb07.7a6948",
+    "id": "4cfd3be4.f62fcc",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4011.683303833008,
-    "y": 2678.683303833008,
-    "z": "294b5e8a.041612",
+    "x": 4019.683303833008,
+    "y": 2633.683303833008,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "699d84d7.6602fc",
+    "id": "43ad3093.31a088",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4385.016830444336,
-    "y": 2641.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4393.016830444336,
+    "y": 2596.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "34b4944b.960704",
+    "id": "2753f3be.c9c924",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4389.016830444336,
-    "y": 2555.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4397.016830444336,
+    "y": 2510.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "276189b1.3ed3ce",
-        "a978fa30.e2e848"
+        "a6bf1231.b0b2f8",
+        "b6449bb5.90e018"
       ]
     ]
   },
   {
-    "id": "386bba62.16259e",
+    "id": "ad7b62a1.1a3de8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4375.302444458008,
-    "y": 2725.505081176758,
-    "z": "294b5e8a.041612",
+    "x": 4383.302444458008,
+    "y": 2680.505081176758,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "89559da6.e6cb3"
+        "e5d22111.f520c"
       ]
     ]
   },
   {
-    "id": "2c7fef61.a7451",
+    "id": "e4759099.9196a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4276.516952514648,
-    "y": 2435.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4284.516952514648,
+    "y": 2390.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "276189b1.3ed3ce",
+    "id": "a6bf1231.b0b2f8",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
     "comments": "",
-    "x": 4559.016830444336,
-    "y": 2516.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4567.016830444336,
+    "y": 2471.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a978fa30.e2e848",
+    "id": "b6449bb5.90e018",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
     "comments": "",
-    "x": 4560.016830444336,
-    "y": 2621.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4568.016830444336,
+    "y": 2576.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1a2899c1.f9127e",
+    "id": "2544beb5.524cf2",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4555.016830444336,
-    "y": 2570.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4563.016830444336,
+    "y": 2525.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "89559da6.e6cb3",
+    "id": "e5d22111.f520c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4582.133987426758,
-    "y": 2715.0237579345703,
-    "z": "294b5e8a.041612",
+    "x": 4590.133987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8f483fd3.15e2b",
-        "5a0d7606.c42ec8",
-        "f5ace162.1d1728"
+        "387e5354.258eec",
+        "d91f6407.9298c8",
+        "8a12363d.8f67b8"
       ]
     ]
   },
   {
-    "id": "8f483fd3.15e2b",
+    "id": "387e5354.258eec",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4797.133987426758,
-    "y": 2677.0237579345703,
-    "z": "294b5e8a.041612",
+    "x": 4805.133987426758,
+    "y": 2632.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5a0d7606.c42ec8",
+    "id": "d91f6407.9298c8",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4794.133987426758,
-    "y": 2716.0237579345703,
-    "z": "294b5e8a.041612",
+    "x": 4802.133987426758,
+    "y": 2671.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "be061b72.c7b818"
+        "824c0ca3.93f64"
       ]
     ]
   },
   {
-    "id": "f5ace162.1d1728",
+    "id": "8a12363d.8f67b8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4749.633987426758,
-    "y": 2758.0237579345703,
-    "z": "294b5e8a.041612",
+    "x": 4757.633987426758,
+    "y": 2713.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b11d681f.057f4",
+    "id": "b23c99bf.cf2e8",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4843.016830444336,
-    "y": 2393.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4851.016830444336,
+    "y": 2348.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "530fa7ff.bc17d"
+        "97206b42.8c742"
       ]
     ]
   },
   {
-    "id": "723c9a0.e71c268",
+    "id": "b2ff1ea.8d4406",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4445.016830444336,
-    "y": 2389.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4453.016830444336,
+    "y": 2344.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "46b1f311.91a404"
+        "3bc9e41b.32e2f4"
       ]
     ]
   },
   {
-    "id": "46b1f311.91a404",
+    "id": "3bc9e41b.32e2f4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4640.016830444336,
-    "y": 2389.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4648.016830444336,
+    "y": 2344.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b11d681f.057f4",
-        "6f790d02.3c377c"
+        "b23c99bf.cf2e8",
+        "c333a868.fb119"
       ]
     ]
   },
   {
-    "id": "6f790d02.3c377c",
+    "id": "c333a868.fb119",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4845.016830444336,
-    "y": 2466.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 4853.016830444336,
+    "y": 2421.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e6043cfa.36703"
+        "bd453b0b.71f93"
       ]
     ]
   },
   {
-    "id": "be061b72.c7b818",
+    "id": "824c0ca3.93f64",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4974.633987426758,
-    "y": 2715.0237579345703,
-    "z": "294b5e8a.041612",
+    "x": 4982.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ce777f2e.3171a8"
+        "95206ee6.94dd"
       ]
     ]
   },
   {
-    "id": "ce777f2e.3171a8",
+    "id": "95206ee6.94dd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5132.633987426758,
-    "y": 2715.0237579345703,
-    "z": "294b5e8a.041612",
+    "x": 5140.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b697c93d.c44198"
+        "a1087d28.90e2f"
       ]
     ]
   },
   {
-    "id": "b697c93d.c44198",
+    "id": "a1087d28.90e2f",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5339.633987426758,
-    "y": 2715.0237579345703,
-    "z": "294b5e8a.041612",
+    "x": 5347.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "530fa7ff.bc17d",
+    "id": "97206b42.8c742",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5020.016830444336,
-    "y": 2385.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5028.016830444336,
+    "y": 2340.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5455e2bb.51abf4",
-        "38fcf2b0.31bbc6"
+        "4cfed3d4.2e715c",
+        "b3c82e8a.c152c"
       ]
     ]
   },
   {
-    "id": "38fcf2b0.31bbc6",
+    "id": "b3c82e8a.c152c",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5228.016830444336,
-    "y": 2392.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5236.016830444336,
+    "y": 2347.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "46db257f.be5d5c",
-        "10ef5dcf.987c42",
-        "cdb4ea9.23d2198"
+        "c3765dd7.98e19",
+        "82480139.31c848",
+        "da19380a.5cc67"
       ]
     ]
   },
   {
-    "id": "e6043cfa.36703",
+    "id": "bd453b0b.71f93",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5022.016830444336,
-    "y": 2458.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5030.016830444336,
+    "y": 2413.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dba257b1.4bfa28"
+        "14471967.2bb00f"
       ]
     ]
   },
   {
-    "id": "5455e2bb.51abf4",
+    "id": "4cfed3d4.2e715c",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainC id",
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5258.016830444336,
-    "y": 2340.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5266.016830444336,
+    "y": 2295.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "dba257b1.4bfa28",
+    "id": "14471967.2bb00f",
     "type": "set",
     "name": "set domainC ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5257.016830444336,
-    "y": 2582.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5265.016830444336,
+    "y": 2537.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "46db257f.be5d5c",
+    "id": "c3765dd7.98e19",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5438.016830444336,
-    "y": 2383.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5446.016830444336,
+    "y": 2338.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "40633d04.a1b504"
+        "eb76aab.05915d8"
       ]
     ]
   },
   {
-    "id": "10ef5dcf.987c42",
+    "id": "82480139.31c848",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5430.016830444336,
-    "y": 2438.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5438.016830444336,
+    "y": 2393.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7af2b98b.8d665"
+        "3c8ef50f.dc9d5a"
       ]
     ]
   },
   {
-    "id": "cdb4ea9.23d2198",
+    "id": "da19380a.5cc67",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5435.016830444336,
-    "y": 2495.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5443.016830444336,
+    "y": 2450.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f683ae7d.1eb048"
+        "11ed4dc4.069aca"
       ]
     ]
   },
   {
-    "id": "f683ae7d.1eb048",
+    "id": "11ed4dc4.069aca",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5587.016830444336,
-    "y": 2496.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5595.016830444336,
+    "y": 2451.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7af2b98b.8d665",
+    "id": "3c8ef50f.dc9d5a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5598.016830444336,
-    "y": 2441.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5606.016830444336,
+    "y": 2396.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "40633d04.a1b504",
+    "id": "eb76aab.05915d8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5582.399154663086,
-    "y": 2381.339126586914,
-    "z": "294b5e8a.041612",
+    "x": 5590.399154663086,
+    "y": 2336.339126586914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8b20e4dc.c76628"
+        "57675f66.16eb5"
       ]
     ]
   },
   {
-    "id": "8b20e4dc.c76628",
+    "id": "57675f66.16eb5",
     "type": "set",
     "name": "set controller domainC data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5797.016830444336,
-    "y": 2377.6834564208984,
-    "z": "294b5e8a.041612",
+    "x": 5805.016830444336,
+    "y": 2332.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c989c621.8b708",
+    "id": "a78822a6.5321b",
     "type": "switchNode",
     "name": "switch secondary empty?",
     "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3310.683334350586,
-    "y": 850.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 3318.683334350586,
+    "y": 805.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c25ccae3.59498",
-        "69b0287f.333378"
+        "ee3317c4.be6f98",
+        "785558d0.46aa7"
       ]
     ]
   },
   {
-    "id": "c25ccae3.59498",
+    "id": "ee3317c4.be6f98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3432.683364868164,
-    "y": 795.6833648681641,
-    "z": "294b5e8a.041612",
+    "x": 3440.683364868164,
+    "y": 750.6833648681641,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "18001e31.10fe62"
+        "b70329ff.3ba71"
       ]
     ]
   },
   {
-    "id": "69b0287f.333378",
+    "id": "785558d0.46aa7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3419.683364868164,
-    "y": 904.6833648681641,
-    "z": "294b5e8a.041612",
+    "x": 3427.683364868164,
+    "y": 859.6833648681641,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "643ae015.6b3ff8"
+        "e7d34a7a.6aac6"
       ]
     ]
   },
   {
-    "id": "18001e31.10fe62",
+    "id": "b70329ff.3ba71",
     "type": "set",
     "name": "set hasSecondary false",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
     "comments": "",
-    "x": 3647.683334350586,
-    "y": 632.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 3655.683334350586,
+    "y": 587.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "643ae015.6b3ff8",
+    "id": "e7d34a7a.6aac6",
     "type": "set",
     "name": "set hasSecondary true",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 3643.683334350586,
-    "y": 676.6833343505859,
-    "z": "294b5e8a.041612",
+    "x": 3651.683334350586,
+    "y": 631.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "25259a32.c04fe6",
+    "id": "3cc87f7.3864a",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3840.683364868164,
-    "y": 3576.683364868164,
-    "z": "294b5e8a.041612",
+    "x": 3848.683364868164,
+    "y": 3531.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e17fd7c.5d8d2a8"
+        "f7171cc6.827928"
       ]
     ]
   },
   {
-    "id": "e17fd7c.5d8d2a8",
+    "id": "f7171cc6.827928",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4031.683364868164,
-    "y": 3580.683364868164,
-    "z": "294b5e8a.041612",
+    "x": 4039.683364868164,
+    "y": 3535.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6f9d8ee6.40f9a8"
+        "27271b87.886184"
       ]
     ]
   },
   {
-    "id": "6f9d8ee6.40f9a8",
+    "id": "27271b87.886184",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4158.683364868164,
-    "y": 3579.683364868164,
-    "z": "294b5e8a.041612",
+    "x": 4166.683364868164,
+    "y": 3534.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5d450f44.f186c8",
-        "87679aab.884488"
+        "90e47ea0.ecee8",
+        "8a6c8ced.8f741"
       ]
     ]
   },
   {
-    "id": "87679aab.884488",
+    "id": "8a6c8ced.8f741",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4380.683364868164,
-    "y": 3468.683364868164,
-    "z": "294b5e8a.041612",
+    "x": 4388.683364868164,
+    "y": 3423.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "88b89d66.20648",
+    "id": "a4c94b0b.1b4718",
     "type": "set",
     "name": "unset secondary related variables",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
     "comments": "",
-    "x": 3385.566665649414,
-    "y": 508.56666564941406,
-    "z": "294b5e8a.041612",
+    "x": 3393.566665649414,
+    "y": 463.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5d450f44.f186c8",
+    "id": "90e47ea0.ecee8",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4376.566665649414,
-    "y": 3527.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4384.566665649414,
+    "y": 3482.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a8e3fac.bdef108",
-        "d683cc3e.7534e8"
+        "61b6ba56.719bdc",
+        "226a53c4.28be4c"
       ]
     ]
   },
   {
-    "id": "a8e3fac.bdef108",
+    "id": "61b6ba56.719bdc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4586.566665649414,
-    "y": 3504.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4594.566665649414,
+    "y": 3459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d7e8440b.3d707"
+        "3f2dca65.c993b6"
       ]
     ]
   },
   {
-    "id": "d7e8440b.3d707",
+    "id": "3f2dca65.c993b6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4712.566665649414,
-    "y": 3504.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4720.566665649414,
+    "y": 3459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "23eff82f.a0dc88"
+        "812380f1.94aae8"
       ]
     ]
   },
   {
-    "id": "a5367218.35d1e",
+    "id": "32cc56e4.b47402",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4717.566665649414,
-    "y": 3553.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4725.566665649414,
+    "y": 3508.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "67e71008.eb1898",
-        "df5e72dc.bc108",
-        "728f0d90.8753cc",
-        "8686c784.f837e"
+        "7de42311.cfc97c",
+        "94a4f684.655798",
+        "9102db37.03feb",
+        "168bc7a3.f57628"
       ]
     ]
   },
   {
-    "id": "d683cc3e.7534e8",
+    "id": "226a53c4.28be4c",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4591.566665649414,
-    "y": 3553.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4599.566665649414,
+    "y": 3508.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a5367218.35d1e"
+        "32cc56e4.b47402"
       ]
     ]
   },
   {
-    "id": "23eff82f.a0dc88",
+    "id": "812380f1.94aae8",
     "type": "save",
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5040.566665649414,
-    "y": 3501.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5048.566665649414,
+    "y": 3456.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "67e71008.eb1898",
+    "id": "7de42311.cfc97c",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainC",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4993.566665649414,
-    "y": 3592.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5001.566665649414,
+    "y": 3547.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "df5e72dc.bc108",
+    "id": "94a4f684.655798",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4941.566665649414,
-    "y": 3634.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4949.566665649414,
+    "y": 3589.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "728f0d90.8753cc",
+    "id": "9102db37.03feb",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5070.566665649414,
-    "y": 3676.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5078.566665649414,
+    "y": 3631.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "41be2f96.b765f8",
+    "id": "3c0b7ceb.8c4ecc",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 4956.566665649414,
-    "y": 3549.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4964.566665649414,
+    "y": 3504.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8686c784.f837e",
+    "id": "168bc7a3.f57628",
     "type": "save",
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5048.566665649414,
-    "y": 3724.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5056.566665649414,
+    "y": 3679.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "561c7038.198b5",
+    "id": "54d0b322.54c85c",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3868.566665649414,
-    "y": 3527.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3876.566665649414,
+    "y": 3482.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b87e18c5.0db5e8",
+    "id": "5fefabc6.f62f5c",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3843.566665649414,
-    "y": 4198.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3851.566665649414,
+    "y": 4153.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "be1f4e62.15aa38"
+        "b4ef06b7.1fe62"
       ]
     ]
   },
   {
-    "id": "be1f4e62.15aa38",
+    "id": "b4ef06b7.1fe62",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4035.566665649414,
-    "y": 4193.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4043.566665649414,
+    "y": 4148.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a0659afe.abed3"
+        "815df3f1.7eb0f"
       ]
     ]
   },
   {
-    "id": "a0659afe.abed3",
+    "id": "815df3f1.7eb0f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4164.566665649414,
-    "y": 4193.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4172.566665649414,
+    "y": 4148.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aacb47f4.be072"
+        "67264e9c.83602"
       ]
     ]
   },
   {
-    "id": "aacb47f4.be072",
+    "id": "67264e9c.83602",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4496.566665649414,
-    "y": 4191.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4504.566665649414,
+    "y": 4146.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "88b90ca8.e250c",
+    "id": "dbd95dbb.cf097",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3831.566665649414,
-    "y": 4422.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3839.566665649414,
+    "y": 4377.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d69507e0.d93c6"
+        "aef64578.f3199"
       ]
     ]
   },
   {
-    "id": "d69507e0.d93c6",
+    "id": "aef64578.f3199",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4011.566665649414,
-    "y": 4421.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4019.566665649414,
+    "y": 4376.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "280736a4.7aa0f2"
+        "9830e38b.25b19"
       ]
     ]
   },
   {
-    "id": "280736a4.7aa0f2",
+    "id": "9830e38b.25b19",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4140.566665649414,
-    "y": 4421.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4148.566665649414,
+    "y": 4376.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ff5dea73.98b998"
+        "7d4e5c3a.fc6a0c"
       ]
     ]
   },
   {
-    "id": "ff5dea73.98b998",
+    "id": "7d4e5c3a.fc6a0c",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4358.449966430664,
-    "y": 4420.449966430664,
-    "z": "294b5e8a.041612",
+    "x": 4366.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "860e2e4b.61a0d8"
+        "1e59b518.b0bee3"
       ]
     ]
   },
   {
-    "id": "860e2e4b.61a0d8",
+    "id": "1e59b518.b0bee3",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573.449966430664,
-    "y": 4420.449966430664,
-    "z": "294b5e8a.041612",
+    "x": 4581.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3ff2617b.840e76"
+        "40af1183.5043e"
       ]
     ]
   },
   {
-    "id": "3ff2617b.840e76",
+    "id": "40af1183.5043e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4705.449966430664,
-    "y": 4420.449966430664,
-    "z": "294b5e8a.041612",
+    "x": 4713.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "96149cb2.d633c"
+        "9532f45e.79d66"
       ]
     ]
   },
   {
-    "id": "96149cb2.d633c",
+    "id": "9532f45e.79d66",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5069.566665649414,
-    "y": 4419.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5077.566665649414,
+    "y": 4374.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f0668881.7d6d6",
+    "id": "147222b6.72d4a5",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3506.566665649414,
-    "y": 4677.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3514.566665649414,
+    "y": 4632.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2492336a.68b20c"
+        "adad110b.2a8008"
       ]
     ]
   },
   {
-    "id": "2492336a.68b20c",
+    "id": "adad110b.2a8008",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3686.566665649414,
-    "y": 4676.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3694.566665649414,
+    "y": 4631.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f54b8794.2acdd"
+        "b9b6357c.7dc958"
       ]
     ]
   },
   {
-    "id": "f54b8794.2acdd",
+    "id": "b9b6357c.7dc958",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3815.566665649414,
-    "y": 4676.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3823.566665649414,
+    "y": 4631.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c3a4f53e.304d78"
+        "883d53e4.0057c"
       ]
     ]
   },
   {
-    "id": "84f57def.b063a",
+    "id": "8f1b73bf.36d998",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3551.566665649414,
-    "y": 4735.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3559.566665649414,
+    "y": 4690.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cebbd661.72d4b8",
+    "id": "f9162d4b.d76cb",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.566665649414,
-    "y": 4834.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4125.566665649414,
+    "y": 4789.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c3a4f53e.304d78",
+    "id": "883d53e4.0057c",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3581.566665649414,
-    "y": 4768.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3589.566665649414,
+    "y": 4723.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d76d7ba.037948",
-        "c6779daf.7d7a8",
-        "62f3b274.175fb4"
+        "a081e505.7d3b8",
+        "370b0cd4.1d67f4",
+        "3bb246d3.6b0eb2"
       ]
     ]
   },
   {
-    "id": "c6779daf.7d7a8",
+    "id": "370b0cd4.1d67f4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3763.057632446289,
-    "y": 4746.140884399414,
-    "z": "294b5e8a.041612",
+    "x": 3771.057632446289,
+    "y": 4701.140884399414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "168b9f85.394368"
+        "21a39fa9.8cdbc"
       ]
     ]
   },
   {
-    "id": "62f3b274.175fb4",
+    "id": "3bb246d3.6b0eb2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3751.566665649414,
-    "y": 4785.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3759.566665649414,
+    "y": 4740.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6d9d5aec.85fd34"
+        "3acf6433.2f683c"
       ]
     ]
   },
   {
-    "id": "168b9f85.394368",
+    "id": "21a39fa9.8cdbc",
     "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": 3922.629165649414,
-    "y": 4744.426528930664,
-    "z": "294b5e8a.041612",
+    "x": 3930.629165649414,
+    "y": 4699.426528930664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6d9d5aec.85fd34",
+    "id": "3acf6433.2f683c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3912.566665649414,
-    "y": 4786.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3920.566665649414,
+    "y": 4741.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1514bf18.105d59",
+    "id": "c435208e.fb61a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3914.566665649414,
-    "y": 4830.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3922.566665649414,
+    "y": 4785.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "16719b54.ca935d",
-        "cebbd661.72d4b8"
+        "6438caae.bf37d4",
+        "f9162d4b.d76cb"
       ]
     ]
   },
   {
-    "id": "9d76d7ba.037948",
+    "id": "a081e505.7d3b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3756.566665649414,
-    "y": 4822.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 3764.566665649414,
+    "y": 4777.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1514bf18.105d59"
+        "c435208e.fb61a8"
       ]
     ]
   },
   {
-    "id": "16719b54.ca935d",
+    "id": "6438caae.bf37d4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4075.566665649414,
-    "y": 4762.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4083.566665649414,
+    "y": 4717.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "993866bb.1b2058",
+    "id": "3f5c519e.52fcfe",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4441.566665649414,
-    "y": 5330.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4449.566665649414,
+    "y": 5285.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f715ac9f.9b32b8",
+    "id": "128b476.c3c24b9",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4596.566665649414,
-    "y": 5371.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4604.566665649414,
+    "y": 5326.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c2d27f90.576768",
+    "id": "ef90095c.80a978",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5039.566665649414,
-    "y": 5419.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5047.566665649414,
+    "y": 5374.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "79d51ab0.5a125c",
+    "id": "b1e27ce1.629f7",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4412.566665649414,
-    "y": 5429.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4420.566665649414,
+    "y": 5384.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fbb7e2aa.d5f0a8",
-        "7443db3b.00f94c"
+        "6c93874b.ea46a8",
+        "a48ce649.08b9f8"
       ]
     ]
   },
   {
-    "id": "fbb7e2aa.d5f0a8",
+    "id": "6c93874b.ea46a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4648.566665649414,
-    "y": 5413.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4656.566665649414,
+    "y": 5368.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2a6159e8.abaf0e"
+        "2bac874c.98bee"
       ]
     ]
   },
   {
-    "id": "2a6159e8.abaf0e",
+    "id": "2bac874c.98bee",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4792.566665649414,
-    "y": 5415.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4800.566665649414,
+    "y": 5370.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c2d27f90.576768",
-        "5c6afd36.faf1f4",
-        "86183466.e0956"
+        "ef90095c.80a978",
+        "900ede93.5cfd68",
+        "c9e4ee74.f1da1"
       ]
     ]
   },
   {
-    "id": "7443db3b.00f94c",
+    "id": "a48ce649.08b9f8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4647.566665649414,
-    "y": 5461.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4655.566665649414,
+    "y": 5416.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5c6afd36.faf1f4",
+    "id": "900ede93.5cfd68",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5160.566665649414,
-    "y": 5466.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5168.566665649414,
+    "y": 5421.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "86183466.e0956",
+    "id": "c9e4ee74.f1da1",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5042.233657836914,
-    "y": 5551.650161743164,
-    "z": "294b5e8a.041612",
+    "x": 5050.233657836914,
+    "y": 5506.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "85909b06.96d1d8",
+    "id": "80a5d0bc.394668",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5043.450454711914,
-    "y": 5510.449966430664,
-    "z": "294b5e8a.041612",
+    "x": 5051.450454711914,
+    "y": 5465.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d5d61aed.e9642",
+    "id": "7af1ce17.a2c558",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5574.566665649414,
-    "y": 5898.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5582.566665649414,
+    "y": 5853.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cfe4284f.245dc",
+    "id": "9c03eaae.aa875",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4947.566665649414,
-    "y": 5908.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4955.566665649414,
+    "y": 5863.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "67276eef.04fd3",
-        "9ce9471a.def67"
+        "c8852cc.de0315",
+        "d3e42d04.fd0a28"
       ]
     ]
   },
   {
-    "id": "67276eef.04fd3",
+    "id": "c8852cc.de0315",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5180.566665649414,
-    "y": 5902.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5188.566665649414,
+    "y": 5857.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7fd061d3.3dea5"
+        "3860ec82.4027f4"
       ]
     ]
   },
   {
-    "id": "7fd061d3.3dea5",
+    "id": "3860ec82.4027f4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5327.566665649414,
-    "y": 5910.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5335.566665649414,
+    "y": 5865.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d5d61aed.e9642",
-        "f7e19ea0.d5ede",
-        "ccb01b06.92e6a8"
+        "7af1ce17.a2c558",
+        "cf788720.b865d8",
+        "78c6b3da.3a0f94"
       ]
     ]
   },
   {
-    "id": "9ce9471a.def67",
+    "id": "d3e42d04.fd0a28",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5181.566665649414,
-    "y": 5952.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5189.566665649414,
+    "y": 5907.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7e19ea0.d5ede",
+    "id": "cf788720.b865d8",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5695.566665649414,
-    "y": 5945.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5703.566665649414,
+    "y": 5900.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ccb01b06.92e6a8",
+    "id": "78c6b3da.3a0f94",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5577.233657836914,
-    "y": 6030.650161743164,
-    "z": "294b5e8a.041612",
+    "x": 5585.233657836914,
+    "y": 5985.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e15ccbfd.b5904",
+    "id": "187aa522.975483",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5578.450454711914,
-    "y": 5989.449966430664,
-    "z": "294b5e8a.041612",
+    "x": 5586.450454711914,
+    "y": 5944.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "986cd5c9.02e9d",
+    "id": "a4cbceb2.4df788",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5108.566665649414,
-    "y": 5858.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 5116.566665649414,
+    "y": 5813.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4899b08.51e5b",
+    "id": "1eb398cf.3d4a57",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4942.566665649414,
-    "y": 5819.566665649414,
-    "z": "294b5e8a.041612",
+    "x": 4950.566665649414,
+    "y": 5774.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c617e6ee.8b983",
+    "id": "629500a0.f350c",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3269.816665649414,
-    "y": 6428.816665649414,
-    "z": "294b5e8a.041612",
+    "x": 3277.816665649414,
+    "y": 6383.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9cb4bafc.51db",
-        "31675b48.f480a4"
+        "9cad2425.bfa4",
+        "5e118a1d.622834"
       ]
     ]
   },
   {
-    "id": "9cb4bafc.51db",
+    "id": "9cad2425.bfa4",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3460.816665649414,
-    "y": 6432.816665649414,
-    "z": "294b5e8a.041612",
+    "x": 3468.816665649414,
+    "y": 6387.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4d6a56c7.6a325"
+        "eaa9d7ab.22184"
       ]
     ]
   },
   {
-    "id": "4d6a56c7.6a325",
+    "id": "eaa9d7ab.22184",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3587.816665649414,
-    "y": 6431.816665649414,
-    "z": "294b5e8a.041612",
+    "x": 3595.816665649414,
+    "y": 6386.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c5539a8b.106aa"
+        "517fe5d1.d6143c"
       ]
     ]
   },
   {
-    "id": "31675b48.f480a4",
+    "id": "5e118a1d.622834",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3456.816665649414,
-    "y": 6502.816665649414,
-    "z": "294b5e8a.041612",
+    "x": 3464.816665649414,
+    "y": 6457.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8a9f9d03.ba9c7"
+        "3146887c.847d98"
       ]
     ]
   },
   {
-    "id": "9f506842.a5d348",
+    "id": "9e160da7.86044",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4006.316665649414,
-    "y": 6501.900161743164,
-    "z": "294b5e8a.041612",
+    "x": 4014.316665649414,
+    "y": 6456.900161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a9f9d03.ba9c7",
+    "id": "3146887c.847d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3590.316665649414,
-    "y": 6504.900161743164,
-    "z": "294b5e8a.041612",
+    "x": 3598.316665649414,
+    "y": 6459.900161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9f506842.a5d348"
+        "9e160da7.86044"
       ]
     ]
   }
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 807831e8..7f05d90e 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "a36be240.71b108",
+    "id": "25755a71.e1632e",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 181.56666564941406,
-    "y": 140.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 123.56666564941406,
+    "y": 162.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d32c48f4.aac76"
+        "9782b41f.c0bae8"
       ]
     ]
   },
   {
-    "id": "d32c48f4.aac76",
+    "id": "9782b41f.c0bae8",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,10540 +22,10540 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 465.85235595703125,
-    "y": 201.52385997772217,
-    "z": "3edf77d7.add3c",
+    "x": 407.85235595703125,
+    "y": 223.32380199432373,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cea08712.e1ad8"
+        "aa6f3182.becc9"
       ]
     ]
   },
   {
-    "id": "cea08712.e1ad8",
+    "id": "aa6f3182.becc9",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-modify",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-modify' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 471.9952697753906,
-    "y": 286.28578186035156,
-    "z": "3edf77d7.add3c",
+    "x": 413.9952697753906,
+    "y": 308.0857238769531,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "81a694dd.59419"
+        "29bc2f8.db80dd"
       ]
     ]
   },
   {
-    "id": "81a694dd.59419",
+    "id": "29bc2f8.db80dd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 821.5666656494141,
-    "y": 345.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 763.5666656494141,
+    "y": 367.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "262c4d6b.8ef302",
-        "f6c757fc.4ac3d8",
-        "5a309470.2c2984"
+        "9c0eb1ca.43b71",
+        "3646fbaf.66abd4",
+        "ab0c0a1d.943358"
       ]
     ]
   },
   {
-    "id": "262c4d6b.8ef302",
+    "id": "9c0eb1ca.43b71",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 1122.900161743164,
-    "y": 616.2160491943359,
-    "z": "3edf77d7.add3c",
+    "x": 1064.900161743164,
+    "y": 638.0159912109375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f6c757fc.4ac3d8",
+    "id": "3646fbaf.66abd4",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
     "comments": "",
     "outputs": 1,
-    "x": 1144.328628540039,
-    "y": 318.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1086.328628540039,
+    "y": 340.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "46d97ddb.2cdac4",
-        "5d275c59.021c7c",
-        "49cae57.69a7f9c"
+        "7f13e7b9.528038",
+        "21855f86.1eb1c",
+        "8626acaa.0dcb08"
       ]
     ]
   },
   {
-    "id": "46d97ddb.2cdac4",
+    "id": "7f13e7b9.528038",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1369.328628540039,
-    "y": 176.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1311.328628540039,
+    "y": 198.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f1f14b39.ae66d8"
+        "d8a6bab4.98cd48"
       ]
     ]
   },
   {
-    "id": "5d275c59.021c7c",
+    "id": "21855f86.1eb1c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1364.819595336914,
-    "y": 246.19309997558594,
-    "z": "3edf77d7.add3c",
+    "x": 1306.819595336914,
+    "y": 267.9930419921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e0fe1751.0d1d08"
+        "2ec478eb.d4cdf8"
       ]
     ]
   },
   {
-    "id": "49cae57.69a7f9c",
+    "id": "8626acaa.0dcb08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1353.328628540039,
-    "y": 292.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1295.328628540039,
+    "y": 314.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "91b68660.fcd578"
+        "7ead638e.196dac"
       ]
     ]
   },
   {
-    "id": "83ec93b8.4f0e58",
+    "id": "250bdb2a.4b0894",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1123.328628540039,
-    "y": 206.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1065.328628540039,
+    "y": 228.41900634765625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5a309470.2c2984",
+    "id": "ab0c0a1d.943358",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1111.328628540039,
-    "y": 258.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1053.328628540039,
+    "y": 280.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f1f14b39.ae66d8",
+    "id": "d8a6bab4.98cd48",
     "type": "switchNode",
     "name": "switch allotted-resources_length != 0",
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1609.566665649414,
-    "y": 173.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1551.566665649414,
+    "y": 195.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "47b460bb.508b6",
-        "e9217582.339fb"
+        "ddda0f66.6b349",
+        "66168207.1d9724"
       ]
     ]
   },
   {
-    "id": "e0fe1751.0d1d08",
+    "id": "2ec478eb.d4cdf8",
     "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": 1519.6290435791016,
-    "y": 249.14552307128906,
-    "z": "3edf77d7.add3c",
+    "x": 1461.6290435791016,
+    "y": 270.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "91b68660.fcd578",
+    "id": "7ead638e.196dac",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1523.566665649414,
-    "y": 293.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1465.566665649414,
+    "y": 315.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "47b460bb.508b6",
+    "id": "ddda0f66.6b349",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1814.566665649414,
-    "y": 210.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1756.566665649414,
+    "y": 232.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4440eff6.476cd"
+        "5c931c3f.aba674"
       ]
     ]
   },
   {
-    "id": "e9217582.339fb",
+    "id": "66168207.1d9724",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1824.566665649414,
-    "y": 137.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1766.566665649414,
+    "y": 159.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4440eff6.476cd",
+    "id": "5c931c3f.aba674",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1807.566665649414,
-    "y": 285.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1749.566665649414,
+    "y": 307.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3986b18c.a9e7ae",
-        "1a55fc09.fb08cc",
-        "84bc3e18.c9d6e",
-        "63b2fdab.785aac",
-        "dfc7a62b.53e19"
+        "b951c0d0.48c67",
+        "3ae502fc.de69ae",
+        "7554f41e.870f04",
+        "b94dc7e3.86f89",
+        "37dc60ca.62221"
       ]
     ]
   },
   {
-    "id": "1cb8dc69.891db4",
+    "id": "fb84a849.18463",
     "type": "save",
     "name": "get allotted-resource from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2293.566665649414,
-    "y": 336.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2235.566665649414,
+    "y": 358.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d730a66e.613558",
-        "3006b8b.6e69448",
-        "f68070c6.2ea968"
+        "7f791be2.0d23ec",
+        "6090d832.b4d3b8",
+        "b011647e.200f58"
       ]
     ]
   },
   {
-    "id": "d730a66e.613558",
+    "id": "7f791be2.0d23ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2509.566665649414,
-    "y": 403.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2451.566665649414,
+    "y": 425.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e3579fa8.43b168"
+        "f400ea8d.94bbd8"
       ]
     ]
   },
   {
-    "id": "3006b8b.6e69448",
+    "id": "6090d832.b4d3b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2510.057632446289,
-    "y": 302.85972595214844,
-    "z": "3edf77d7.add3c",
+    "x": 2452.057632446289,
+    "y": 324.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6bbc8555.572b94"
+        "84744d3b.9da2a"
       ]
     ]
   },
   {
-    "id": "f68070c6.2ea968",
+    "id": "b011647e.200f58",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2505.566665649414,
-    "y": 352.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2447.566665649414,
+    "y": 374.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a1a8f5c7.a1ada"
+        "d7ef13e5.e943b8"
       ]
     ]
   },
   {
-    "id": "3986b18c.a9e7ae",
+    "id": "b951c0d0.48c67",
     "type": "for",
     "name": "for each allotted-resource",
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2010.566665649414,
-    "y": 317.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1952.566665649414,
+    "y": 339.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "62594551.389614",
-        "1cb8dc69.891db4",
-        "1902c403.6fb814",
-        "b21e9d77.e0db"
+        "4b529d8b.e7269c",
+        "fb84a849.18463",
+        "4f8a0bf3.f76a6c",
+        "6a76544b.f753cc"
       ]
     ]
   },
   {
-    "id": "62594551.389614",
+    "id": "4b529d8b.e7269c",
     "type": "set",
     "name": "set the current allotted-resource-id",
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
     "comments": "",
-    "x": 2290.566665649414,
-    "y": 255.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2232.566665649414,
+    "y": 277.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "63b2fdab.785aac",
+    "id": "b94dc7e3.86f89",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
     "comments": "",
-    "x": 1984.566665649414,
-    "y": 267.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1926.566665649414,
+    "y": 289.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1a55fc09.fb08cc",
+    "id": "3ae502fc.de69ae",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2027.566665649414,
-    "y": 126.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1969.566665649414,
+    "y": 148.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "84bc3e18.c9d6e",
+    "id": "7554f41e.870f04",
     "type": "get-resource",
     "name": "get-resource logical-links",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2039.566665649414,
-    "y": 167.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1981.566665649414,
+    "y": 189.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "70e12844.2efb58",
+    "id": "c4ed6feb.870ac",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2064.566665649414,
-    "y": 79.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2006.566665649414,
+    "y": 101.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1582189.5e20967",
+    "id": "3fa0fea5.b1a7a2",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
     "comments": "",
-    "x": 1984.566665649414,
-    "y": 213.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1926.566665649414,
+    "y": 235.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6bbc8555.572b94",
+    "id": "84744d3b.9da2a",
     "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": 2688.566665649414,
-    "y": 305.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2630.566665649414,
+    "y": 327.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a1a8f5c7.a1ada",
+    "id": "d7ef13e5.e943b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2688.504165649414,
-    "y": 354.42601013183594,
-    "z": "3edf77d7.add3c",
+    "x": 2630.504165649414,
+    "y": 376.2259521484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e3579fa8.43b168",
+    "id": "f400ea8d.94bbd8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2690.504165649414,
-    "y": 405.42601013183594,
-    "z": "3edf77d7.add3c",
+    "x": 2632.504165649414,
+    "y": 427.2259521484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "234c19dd.3792f6"
+        "3f239fa1.c0b958"
       ]
     ]
   },
   {
-    "id": "234c19dd.3792f6",
+    "id": "3f239fa1.c0b958",
     "type": "save",
     "name": "get allotted-resource relationship from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3025.504165649414,
-    "y": 174.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 2967.504165649414,
+    "y": 196.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "403040fa.29d128",
-        "d2e9aaef.69fb08",
-        "b24293ea.efd47"
+        "b38986d.d0d7878",
+        "824af3e9.18d3c",
+        "c4ad697c.ed235"
       ]
     ]
   },
   {
-    "id": "d2e9aaef.69fb08",
+    "id": "824af3e9.18d3c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3298.995132446289,
-    "y": 67,
-    "z": "3edf77d7.add3c",
+    "x": 3240.995132446289,
+    "y": 88.79994201660156,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fccce16d.0a609"
+        "53ebc234.9c89e4"
       ]
     ]
   },
   {
-    "id": "fccce16d.0a609",
+    "id": "53ebc234.9c89e4",
     "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": 3476.566665649414,
-    "y": 67.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3418.566665649414,
+    "y": 89.08570861816406,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b24293ea.efd47",
+    "id": "c4ad697c.ed235",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3294.504165649414,
-    "y": 116.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 3236.504165649414,
+    "y": 138.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1cbd7c7f.481b8c"
+        "d35b45c.ac75538"
       ]
     ]
   },
   {
-    "id": "1cbd7c7f.481b8c",
+    "id": "d35b45c.ac75538",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3476.504165649414,
-    "y": 116.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 3418.504165649414,
+    "y": 138.22596740722656,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "403040fa.29d128",
+    "id": "b38986d.d0d7878",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3298.504165649414,
-    "y": 167.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 3240.504165649414,
+    "y": 189.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6553de3d.0fe06"
+        "cda04f1c.b5e8e8"
       ]
     ]
   },
   {
-    "id": "6553de3d.0fe06",
+    "id": "cda04f1c.b5e8e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3478.504165649414,
-    "y": 167.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 3420.504165649414,
+    "y": 189.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a3b12c76.41d528"
+        "9d21d2af.f1a338"
       ]
     ]
   },
   {
-    "id": "a3b12c76.41d528",
+    "id": "9d21d2af.f1a338",
     "type": "switchNode",
     "name": "switch allotted-resource.relationship-list not empty",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3044.566665649414,
-    "y": 302.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 2986.566665649414,
+    "y": 324.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "18fdd62.581202a",
-        "6160fe1a.c1358"
+        "2a81c517.5bc7ca",
+        "6137d6c5.a89918"
       ]
     ]
   },
   {
-    "id": "6160fe1a.c1358",
+    "id": "6137d6c5.a89918",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3354.566665649414,
-    "y": 309.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3296.566665649414,
+    "y": 331.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "18fdd62.581202a",
+    "id": "2a81c517.5bc7ca",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3353.566665649414,
-    "y": 363.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3295.566665649414,
+    "y": 385.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "be5e6e3e.4df078"
+        "5824c72f.9c5af"
       ]
     ]
   },
   {
-    "id": "93300adf.7164e",
+    "id": "28f331ee.9053e6",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4098.566665649414,
-    "y": 317.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 4040.566665649414,
+    "y": 339.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4304d9fb.fb05f8"
+        "75d3715b.ab7198"
       ]
     ]
   },
   {
-    "id": "4304d9fb.fb05f8",
+    "id": "75d3715b.ab7198",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4275.566543579102,
-    "y": 310.28564453125,
-    "z": "3edf77d7.add3c",
+    "x": 4217.566543579102,
+    "y": 332.08558654785156,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "57e483bc.d9d9f4",
-        "be73e257.6c7c7"
+        "ae2a4fce.8a1ea",
+        "2c72c44.f2aec3c"
       ]
     ]
   },
   {
-    "id": "be5e6e3e.4df078",
+    "id": "5824c72f.9c5af",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3517.566665649414,
-    "y": 289.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3459.566665649414,
+    "y": 311.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7cff4b8c.a234a4",
-        "44a90848.8f1578"
+        "a5e82cdc.4d956",
+        "b714d40c.0dac68"
       ]
     ]
   },
   {
-    "id": "7cff4b8c.a234a4",
+    "id": "a5e82cdc.4d956",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3798.566665649414,
-    "y": 245.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3740.566665649414,
+    "y": 267.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9f045210.d63268"
+        "e552898d.0c1d9"
       ]
     ]
   },
   {
-    "id": "9f045210.d63268",
+    "id": "e552898d.0c1d9",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4060.566665649414,
-    "y": 245.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 4002.566665649414,
+    "y": 267.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "93300adf.7164e"
+        "28f331ee.9053e6"
       ]
     ]
   },
   {
-    "id": "57e483bc.d9d9f4",
+    "id": "ae2a4fce.8a1ea",
     "type": "set",
     "name": "set the 1st network-policy-id",
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 4518.566543579102,
-    "y": 267.28564453125,
-    "z": "3edf77d7.add3c",
+    "x": 4460.566543579102,
+    "y": 289.08558654785156,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "be73e257.6c7c7",
+    "id": "2c72c44.f2aec3c",
     "type": "save",
     "name": "get network-policy from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
     "comments": "",
     "outputs": 1,
-    "x": 4507.566543579102,
-    "y": 322.28564453125,
-    "z": "3edf77d7.add3c",
+    "x": 4449.566543579102,
+    "y": 344.08558654785156,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "626c6aaa.7748cc",
-        "19c4911c.086f1f",
-        "8b5b13a5.9b5548"
+        "9efeb089.3f19c",
+        "79f2e4c0.6b947c",
+        "6e1f853a.2f305c"
       ]
     ]
   },
   {
-    "id": "8b5b13a5.9b5548",
+    "id": "6e1f853a.2f305c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4838.566665649414,
-    "y": 230.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4780.566665649414,
+    "y": 252.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "93609ef4.15443"
+        "4cb6456e.ff636c"
       ]
     ]
   },
   {
-    "id": "93609ef4.15443",
+    "id": "4cb6456e.ff636c",
     "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": 4987.138198852539,
-    "y": 230.57151794433594,
-    "z": "3edf77d7.add3c",
+    "x": 4929.138198852539,
+    "y": 252.3714599609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "156c88bf.8ed887",
+    "id": "7e5b3ac6.b0f59c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4986.075698852539,
-    "y": 274.71177673339844,
-    "z": "3edf77d7.add3c",
+    "x": 4928.075698852539,
+    "y": 296.51171875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "19c4911c.086f1f",
+    "id": "79f2e4c0.6b947c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4827.075698852539,
-    "y": 274.71177673339844,
-    "z": "3edf77d7.add3c",
+    "x": 4769.075698852539,
+    "y": 296.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "156c88bf.8ed887"
+        "7e5b3ac6.b0f59c"
       ]
     ]
   },
   {
-    "id": "626c6aaa.7748cc",
+    "id": "9efeb089.3f19c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4834.075698852539,
-    "y": 353.71177673339844,
-    "z": "3edf77d7.add3c",
+    "x": 4776.075698852539,
+    "y": 375.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b50e966f.55aaa8"
+        "826c9ce5.e54c8"
       ]
     ]
   },
   {
-    "id": "b50e966f.55aaa8",
+    "id": "826c9ce5.e54c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4973.075698852539,
-    "y": 353.71177673339844,
-    "z": "3edf77d7.add3c",
+    "x": 4915.075698852539,
+    "y": 375.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9ee7b526.b79f4",
-        "7630b329.2d07cc"
+        "97cd2b3d.5361c",
+        "b21dac06.214a"
       ]
     ]
   },
   {
-    "id": "9ee7b526.b79f4",
+    "id": "97cd2b3d.5361c",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5178.566665649414,
-    "y": 351.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 5120.566665649414,
+    "y": 373.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7630b329.2d07cc",
+    "id": "b21dac06.214a",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5177.566665649414,
-    "y": 397.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 5119.566665649414,
+    "y": 419.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "44a90848.8f1578",
+    "id": "b714d40c.0dac68",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3615.566665649414,
-    "y": 361.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3557.566665649414,
+    "y": 383.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "62de4c53.8433ac"
+        "1e5b0c1.e0c2e74"
       ]
     ]
   },
   {
-    "id": "62de4c53.8433ac",
+    "id": "1e5b0c1.e0c2e74",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3895.566665649414,
-    "y": 361.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3837.566665649414,
+    "y": 383.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c51917b6.8d7e"
+        "4e4dff53.dcf898"
       ]
     ]
   },
   {
-    "id": "c51917b6.8d7e",
+    "id": "4e4dff53.dcf898",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2266.5667877197266,
-    "y": 792.2858734130859,
-    "z": "3edf77d7.add3c",
+    "x": 2208.5667877197266,
+    "y": 814.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8a5f2855.b691a8"
+        "ac446985.9d513"
       ]
     ]
   },
   {
-    "id": "8a5f2855.b691a8",
+    "id": "ac446985.9d513",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2443.566665649414,
-    "y": 785.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2385.566665649414,
+    "y": 807.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "19e426d6.5b9f81",
-        "949e5077.38a42"
+        "8274477.dcf57b8",
+        "276accab.cdfa24"
       ]
     ]
   },
   {
-    "id": "19e426d6.5b9f81",
+    "id": "8274477.dcf57b8",
     "type": "set",
     "name": "set the current logical-link-name",
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 2686.566665649414,
-    "y": 742.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2628.566665649414,
+    "y": 764.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "949e5077.38a42",
+    "id": "276accab.cdfa24",
     "type": "save",
     "name": "get logical-link from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
     "comments": "",
     "outputs": 1,
-    "x": 2675.566665649414,
-    "y": 797.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2617.566665649414,
+    "y": 819.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "47392897.e24ae8",
-        "e83d2afb.d42318",
-        "ddc13460.7744f"
+        "650f90f1.61d618",
+        "627e407c.cdb6e8",
+        "11b910a0.ac71f7"
       ]
     ]
   },
   {
-    "id": "47392897.e24ae8",
+    "id": "650f90f1.61d618",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2967.057632446289,
-    "y": 775.8597259521484,
-    "z": "3edf77d7.add3c",
+    "x": 2909.057632446289,
+    "y": 797.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "23c66f69.49ece8"
+        "4873b670.d0b66"
       ]
     ]
   },
   {
-    "id": "e83d2afb.d42318",
+    "id": "627e407c.cdb6e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2955.566665649414,
-    "y": 820.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2897.566665649414,
+    "y": 842.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bb790c96.f0e18"
+        "24b3a747.017c5"
       ]
     ]
   },
   {
-    "id": "23c66f69.49ece8",
+    "id": "4873b670.d0b66",
     "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": 3115.629165649414,
-    "y": 776.1454925537109,
-    "z": "3edf77d7.add3c",
+    "x": 3057.629165649414,
+    "y": 797.9454345703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bb790c96.f0e18",
+    "id": "24b3a747.017c5",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3114.566665649414,
-    "y": 820.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3056.566665649414,
+    "y": 842.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ddc13460.7744f",
+    "id": "11b910a0.ac71f7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2962.566665649414,
-    "y": 899.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2904.566665649414,
+    "y": 921.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ce7226da.e17388"
+        "90fde557.205cd"
       ]
     ]
   },
   {
-    "id": "ce7226da.e17388",
+    "id": "90fde557.205cd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3101.566665649414,
-    "y": 899.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3043.566665649414,
+    "y": 921.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5b3288fc.6936d8",
-        "9980ae35.23ba18",
-        "85d1e230.49ed",
-        "bf3e43cc.400f1",
-        "1f78077d.63f4c1",
-        "3d294d62.516b2a",
-        "21946f52.f16938",
-        "35531714.c0e89",
-        "63476979.041bd8",
-        "aac95e09.ab90b8",
-        "d36e02ea.349dc",
-        "ad429900.4c716",
-        "456e0186.bd36f8",
-        "6feba0d9.6ac0b",
-        "c1a83ef0.efb158",
-        "8429e2be.11d098",
-        "334ad959.cb8dd6",
-        "d7f7c5fa.4c43d8",
-        "4bfd3207.06ef5c"
+        "c9c2aba8.a4026",
+        "ff35ed1f.a0a938",
+        "85e3c5ae.d3ea4",
+        "f6929a04.bb038",
+        "aab96898.397318",
+        "1f6e9e43.7e8d42",
+        "158807bc.c2dde8",
+        "b53436ed.4e5d8",
+        "8c4c723a.871028",
+        "af5ed41e.3d53d8",
+        "ad7d5348.0e5498",
+        "36740b66.98fa4c",
+        "344dee20.fc9faa",
+        "8b000822.1c253",
+        "4b552ff.dab62d",
+        "76a3b118.862498",
+        "62eac021.71055",
+        "fbc065ad.333e38",
+        "28bc0683.b68302"
       ]
     ]
   },
   {
-    "id": "b6d13ba8.f00e28",
+    "id": "e37a586.c072528",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3413.566665649414,
-    "y": 449.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 3355.566665649414,
+    "y": 471.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b3288fc.6936d8",
+    "id": "c9c2aba8.a4026",
     "type": "execute",
     "name": "execute UUID generator for otn-tunnel-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3400.5665435791016,
-    "y": 541.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3342.5665435791016,
+    "y": 563.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "6feba0d9.6ac0b",
+    "id": "8b000822.1c253",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 3357.5665435791016,
-    "y": 586.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3299.5665435791016,
+    "y": 608.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9980ae35.23ba18",
+    "id": "ff35ed1f.a0a938",
     "type": "set",
     "name": "set network-route-one",
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
     "comments": "",
-    "x": 3332.5665435791016,
-    "y": 649.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3274.5665435791016,
+    "y": 671.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "85d1e230.49ed",
+    "id": "85e3c5ae.d3ea4",
     "type": "set",
     "name": "set network-route-two",
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
     "comments": "",
-    "x": 3333.5665435791016,
-    "y": 704.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3275.5665435791016,
+    "y": 726.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bf3e43cc.400f1",
+    "id": "f6929a04.bb038",
     "type": "save",
     "name": "get network-route-one from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
     "comments": "",
     "outputs": 1,
-    "x": 3349.5665435791016,
-    "y": 752.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3291.5665435791016,
+    "y": 774.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3a9b85f6.e1582a",
-        "d8d8c3b5.17db1",
-        "94ad08f1.768ca"
+        "b38ce95d.a8d8b",
+        "924a9986.e8ef18",
+        "f99ce89.2f90198"
       ]
     ]
   },
   {
-    "id": "1f78077d.63f4c1",
+    "id": "aab96898.397318",
     "type": "save",
     "name": "get network-route-two from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
     "comments": "",
     "outputs": 1,
-    "x": 3344.566665649414,
-    "y": 819.2856292724609,
-    "z": "3edf77d7.add3c",
+    "x": 3286.566665649414,
+    "y": 841.0855712890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "92b833b8.0a3038",
-        "329b8760.c33988",
-        "4b0996dd.3831d8"
+        "84f95296.4ca828",
+        "1e5b7441.b6964c",
+        "529168b7.ab36c8"
       ]
     ]
   },
   {
-    "id": "3a9b85f6.e1582a",
+    "id": "b38ce95d.a8d8b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3590.566665649414,
-    "y": 580.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3532.566665649414,
+    "y": 602.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "11bdd863.93783"
+        "b93c3fb5.8aab08"
       ]
     ]
   },
   {
-    "id": "d8d8c3b5.17db1",
+    "id": "924a9986.e8ef18",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3586.075698852539,
-    "y": 629.7117767333984,
-    "z": "3edf77d7.add3c",
+    "x": 3528.075698852539,
+    "y": 651.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f63a5915.f8a988"
+        "e5b21304.84d3f"
       ]
     ]
   },
   {
-    "id": "94ad08f1.768ca",
+    "id": "f99ce89.2f90198",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3590.075698852539,
-    "y": 682.7117767333984,
-    "z": "3edf77d7.add3c",
+    "x": 3532.075698852539,
+    "y": 704.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d3671f93.7e55b8"
+        "27a2d9bd.f2416e"
       ]
     ]
   },
   {
-    "id": "11bdd863.93783",
+    "id": "b93c3fb5.8aab08",
     "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": 3739.138198852539,
-    "y": 579.5715179443359,
-    "z": "3edf77d7.add3c",
+    "x": 3681.138198852539,
+    "y": 601.3714599609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f63a5915.f8a988",
+    "id": "e5b21304.84d3f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3729.075698852539,
-    "y": 629.7117767333984,
-    "z": "3edf77d7.add3c",
+    "x": 3671.075698852539,
+    "y": 651.51171875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "92b833b8.0a3038",
+    "id": "84f95296.4ca828",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3594.566665649414,
-    "y": 736.2856292724609,
-    "z": "3edf77d7.add3c",
+    "x": 3536.566665649414,
+    "y": 758.0855712890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "675faf6a.ba5628"
+        "5554565c.9228c"
       ]
     ]
   },
   {
-    "id": "329b8760.c33988",
+    "id": "1e5b7441.b6964c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3590.075698852539,
-    "y": 785.7116546630859,
-    "z": "3edf77d7.add3c",
+    "x": 3532.075698852539,
+    "y": 807.5115966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f0edefdd.7fbf88"
+        "6ebd88b9.37bc78"
       ]
     ]
   },
   {
-    "id": "4b0996dd.3831d8",
+    "id": "529168b7.ab36c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3573.075698852539,
-    "y": 833.7116546630859,
-    "z": "3edf77d7.add3c",
+    "x": 3515.075698852539,
+    "y": 855.5115966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d42db304.4749e8"
+        "a79b682c.88ba1"
       ]
     ]
   },
   {
-    "id": "675faf6a.ba5628",
+    "id": "5554565c.9228c",
     "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": 3743.138198852539,
-    "y": 735.5713958740234,
-    "z": "3edf77d7.add3c",
+    "x": 3685.138198852539,
+    "y": 757.371337890625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f0edefdd.7fbf88",
+    "id": "6ebd88b9.37bc78",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3733.075698852539,
-    "y": 785.7116546630859,
-    "z": "3edf77d7.add3c",
+    "x": 3675.075698852539,
+    "y": 807.5115966796875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d3671f93.7e55b8",
+    "id": "27a2d9bd.f2416e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3751.566665649414,
-    "y": 682.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3693.566665649414,
+    "y": 704.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bbaa9d89.298de8"
+        "e35dbf37.07c328"
       ]
     ]
   },
   {
-    "id": "d42db304.4749e8",
+    "id": "a79b682c.88ba1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3726.566665649414,
-    "y": 833.2856292724609,
-    "z": "3edf77d7.add3c",
+    "x": 3668.566665649414,
+    "y": 855.0855712890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6b53fb28.4b35a4"
+        "25d6cc4d.0a0984"
       ]
     ]
   },
   {
-    "id": "bbaa9d89.298de8",
+    "id": "e35dbf37.07c328",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3923.566665649414,
-    "y": 682.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3865.566665649414,
+    "y": 704.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f5f42bcc.193ca8",
-        "1ca26f5e.24e681",
-        "30c464f6.21891c"
+        "df69d2ac.c94928",
+        "d63273d9.506ef8",
+        "3dcf3da2.14e88a"
       ]
     ]
   },
   {
-    "id": "6b53fb28.4b35a4",
+    "id": "25d6cc4d.0a0984",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3918.566665649414,
-    "y": 767.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3860.566665649414,
+    "y": 789.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4fb6ec71.0d0c04",
-        "a3acc90b.3d737",
-        "513e1ab4.43497c"
+        "284fe38.7ff599c",
+        "574139dc.c55898",
+        "f46ebe04.450d9"
       ]
     ]
   },
   {
-    "id": "f5f42bcc.193ca8",
+    "id": "df69d2ac.c94928",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4084.566177368164,
-    "y": 418.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4026.566177368164,
+    "y": 440.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "47912c0e.49beac"
+        "7ce464fa.676414"
       ]
     ]
   },
   {
-    "id": "1ca26f5e.24e681",
+    "id": "d63273d9.506ef8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4086.566177368164,
-    "y": 472.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4028.566177368164,
+    "y": 494.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "eb199d13.e7038"
+        "6bd6b0d9.b558a"
       ]
     ]
   },
   {
-    "id": "4fb6ec71.0d0c04",
+    "id": "284fe38.7ff599c",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099.565933227539,
-    "y": 640.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4041.565933227539,
+    "y": 662.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ab328b3c.b23248"
+        "6918e709.d57e78"
       ]
     ]
   },
   {
-    "id": "a3acc90b.3d737",
+    "id": "574139dc.c55898",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4101.565933227539,
-    "y": 694.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4043.565933227539,
+    "y": 716.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4b33e71e.9ca98"
+        "688d98a0.dbdc1"
       ]
     ]
   },
   {
-    "id": "8d16f671.5b9d4",
+    "id": "69d167e5.40c62",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4394.566177368164,
-    "y": 370.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4336.566177368164,
+    "y": 392.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5b74c380.dcc8d4",
+    "id": "e079feb5.4893f8",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4387.566177368164,
-    "y": 468.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4329.566177368164,
+    "y": 490.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "142c8c33.b05574",
+    "id": "81aa5c4a.edfc28",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4463.565933227539,
-    "y": 667.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4405.565933227539,
+    "y": 689.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fadd6db5.8e746",
+    "id": "3e901a8b.2e5bae",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4467.565933227539,
-    "y": 760.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4409.565933227539,
+    "y": 782.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bb2a4685.ff5b48",
+    "id": "93aaa3a6.0ddda8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3545.566665649414,
-    "y": 1183.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3487.566665649414,
+    "y": 1205.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8f64a837.4a5cd8"
+        "e42413be.b1fcf8"
       ]
     ]
   },
   {
-    "id": "d520358c.dbd16",
+    "id": "9cfab2db.ec2e9",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3555.057632446289,
-    "y": 1225.8597869873047,
-    "z": "3edf77d7.add3c",
+    "x": 3497.057632446289,
+    "y": 1247.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7a345f50.11385"
+        "b6bb4e8e.b484d"
       ]
     ]
   },
   {
-    "id": "59ef9877.d005",
+    "id": "aba7aaee.8e0cf8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3543.566665649414,
-    "y": 1272.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3485.566665649414,
+    "y": 1294.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "de9d99cd.adc298"
+        "30b7412f.1199ae"
       ]
     ]
   },
   {
-    "id": "487ac0b4.4acab8",
+    "id": "3ca3d712.007d28",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3245.566665649414,
-    "y": 1145.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3187.566665649414,
+    "y": 1167.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "21946f52.f16938",
+    "id": "158807bc.c2dde8",
     "type": "save",
     "name": "get p-interface-src from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3288.566665649414,
-    "y": 1210.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3230.566665649414,
+    "y": 1232.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bb2a4685.ff5b48",
-        "d520358c.dbd16",
-        "59ef9877.d005"
+        "93aaa3a6.0ddda8",
+        "9cfab2db.ec2e9",
+        "aba7aaee.8e0cf8"
       ]
     ]
   },
   {
-    "id": "3d294d62.516b2a",
+    "id": "1f6e9e43.7e8d42",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3277.566665649414,
-    "y": 1060.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3219.566665649414,
+    "y": 1082.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a73d10a4.af1e28",
-        "79cd7ec1.3557b8"
+        "aef080fa.c114b",
+        "ec7d5fb1.6942b"
       ]
     ]
   },
   {
-    "id": "79cd7ec1.3557b8",
+    "id": "ec7d5fb1.6942b",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3500.566665649414,
-    "y": 1046.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3442.566665649414,
+    "y": 1068.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9aeedd68.ffa8d8"
+        "fd803677.f63638"
       ]
     ]
   },
   {
-    "id": "a73d10a4.af1e28",
+    "id": "aef080fa.c114b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3502.566665649414,
-    "y": 1079.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3444.566665649414,
+    "y": 1101.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "df8ae871.d54098"
+        "51e88d79.18cdf4"
       ]
     ]
   },
   {
-    "id": "8f64a837.4a5cd8",
+    "id": "e42413be.b1fcf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3718.233169555664,
-    "y": 1182.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3660.233169555664,
+    "y": 1204.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fbb3abd1.b96e9",
-        "abe82eb0.0cab"
+        "4ed4fbc5.711d0c",
+        "90207f5c.a05dd8"
       ]
     ]
   },
   {
-    "id": "7a345f50.11385",
+    "id": "b6bb4e8e.b484d",
     "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": 3708.6290435791016,
-    "y": 1229.145523071289,
-    "z": "3edf77d7.add3c",
+    "x": 3650.6290435791016,
+    "y": 1250.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "de9d99cd.adc298",
+    "id": "30b7412f.1199ae",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3712.566665649414,
-    "y": 1273.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3654.566665649414,
+    "y": 1295.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fbb3abd1.b96e9",
+    "id": "4ed4fbc5.711d0c",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3982.566665649414,
-    "y": 1233.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3924.566665649414,
+    "y": 1255.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e3260a1d.15ae2",
-        "378a4b05.ba3ff4"
+        "db4ec7c1.fb8ff8",
+        "8a68098.2ae2578"
       ]
     ]
   },
   {
-    "id": "378a4b05.ba3ff4",
+    "id": "8a68098.2ae2578",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4158.566665649414,
-    "y": 1283.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4100.566665649414,
+    "y": 1305.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7538291f.829488"
+        "9f8db296.d1b7"
       ]
     ]
   },
   {
-    "id": "e3260a1d.15ae2",
+    "id": "db4ec7c1.fb8ff8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4160.566665649414,
-    "y": 1347.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4102.566665649414,
+    "y": 1369.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "25aab61c.c2472a"
+        "19ec1ce6.638d63"
       ]
     ]
   },
   {
-    "id": "25aab61c.c2472a",
+    "id": "19ec1ce6.638d63",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4322.566665649414,
-    "y": 1343.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4264.566665649414,
+    "y": 1365.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7538291f.829488",
+    "id": "9f8db296.d1b7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4323.566665649414,
-    "y": 1280.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4265.566665649414,
+    "y": 1302.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "32fabbd2.bab7c4",
-        "d6bf1e67.ba86d8"
+        "5c94bd3f.3e7f94",
+        "fc089afb.f44ed8"
       ]
     ]
   },
   {
-    "id": "df8ae871.d54098",
+    "id": "51e88d79.18cdf4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3645.566665649414,
-    "y": 1076.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3587.566665649414,
+    "y": 1098.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9aeedd68.ffa8d8",
+    "id": "fd803677.f63638",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3648.566665649414,
-    "y": 1039.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3590.566665649414,
+    "y": 1061.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "12c81e56.7fa00a",
-        "87e2ebef.10b6c8"
+        "eccb372c.34c8d",
+        "98d2965b.47a9d8"
       ]
     ]
   },
   {
-    "id": "12c81e56.7fa00a",
+    "id": "eccb372c.34c8d",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3822.566665649414,
-    "y": 995.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3764.566665649414,
+    "y": 1017.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "abe82eb0.0cab",
+    "id": "90207f5c.a05dd8",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3694.566665649414,
-    "y": 1364.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3636.566665649414,
+    "y": 1386.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "67c85268.32dfec"
+        "5a97a44a.833984"
       ]
     ]
   },
   {
-    "id": "67c85268.32dfec",
+    "id": "5a97a44a.833984",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3975.566665649414,
-    "y": 1359.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3917.566665649414,
+    "y": 1381.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "22f4aa3d.402fe6"
+        "1a323487.0d80a3"
       ]
     ]
   },
   {
-    "id": "22f4aa3d.402fe6",
+    "id": "1a323487.0d80a3",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4286.852310180664,
-    "y": 1434.1075286865234,
-    "z": "3edf77d7.add3c",
+    "x": 4228.852310180664,
+    "y": 1455.907470703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4ffa151f.c35edc"
+        "25962334.407414"
       ]
     ]
   },
   {
-    "id": "87e2ebef.10b6c8",
+    "id": "98d2965b.47a9d8",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3837.566665649414,
-    "y": 1106.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3779.566665649414,
+    "y": 1128.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "46c6e0d9.d87168",
-        "d98bf1e8.c353c8",
-        "76b578a.409ac88"
+        "3ec80c0c.a7d6a4",
+        "fb8be251.80b5",
+        "c39223e5.81b608"
       ]
     ]
   },
   {
-    "id": "46c6e0d9.d87168",
+    "id": "3ec80c0c.a7d6a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4033.0667877197266,
-    "y": 1058.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3975.0667877197266,
+    "y": 1080.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7281b691.ff84e"
+        "cee29929.100dd"
       ]
     ]
   },
   {
-    "id": "d98bf1e8.c353c8",
+    "id": "fb8be251.80b5",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4025.0667877197266,
-    "y": 1113.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3967.0667877197266,
+    "y": 1135.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "552f36f.a1294c8"
+        "75204f77.c3b168"
       ]
     ]
   },
   {
-    "id": "76b578a.409ac88",
+    "id": "c39223e5.81b608",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4030.0667877197266,
-    "y": 1170.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3972.0667877197266,
+    "y": 1192.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2fdf3cab.68e914"
+        "24e0ef02.5cfcc"
       ]
     ]
   },
   {
-    "id": "2fdf3cab.68e914",
+    "id": "24e0ef02.5cfcc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4182.066787719727,
-    "y": 1171.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4124.066787719727,
+    "y": 1193.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "552f36f.a1294c8",
+    "id": "75204f77.c3b168",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4193.066787719727,
-    "y": 1116.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4135.066787719727,
+    "y": 1138.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7281b691.ff84e",
+    "id": "cee29929.100dd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4177.449111938477,
-    "y": 1055.941421508789,
-    "z": "3edf77d7.add3c",
+    "x": 4119.449111938477,
+    "y": 1077.7413635253906,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b1882a27.4b4ab8"
+        "20e9a108.5fcefe"
       ]
     ]
   },
   {
-    "id": "b1882a27.4b4ab8",
+    "id": "20e9a108.5fcefe",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4400.566909790039,
-    "y": 1194.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4342.566909790039,
+    "y": 1216.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "491c14e2.9cc81c"
+        "4c952f98.568af8"
       ]
     ]
   },
   {
-    "id": "d6bf1e67.ba86d8",
+    "id": "fc089afb.f44ed8",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
     "comments": "",
-    "x": 4493.566665649414,
-    "y": 1238.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4435.566665649414,
+    "y": 1260.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "32fabbd2.bab7c4",
+    "id": "5c94bd3f.3e7f94",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
     "comments": "",
-    "x": 4494.566665649414,
-    "y": 1346.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4436.566665649414,
+    "y": 1368.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8e04ebf5.eee41",
+    "id": "e2e3430b.441438",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4495.566665649414,
-    "y": 1295.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4437.566665649414,
+    "y": 1317.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4ffa151f.c35edc",
+    "id": "25962334.407414",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4493.683853149414,
-    "y": 1434.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4435.683853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c59a3a79.308e08",
-        "e4841ff6.3e7e08",
-        "5d11c4a6.df68cc"
+        "c4c94be4.c4e6d8",
+        "778cb9b9.8f8fe8",
+        "bf204b7b.9bfdb"
       ]
     ]
   },
   {
-    "id": "c59a3a79.308e08",
+    "id": "c4c94be4.c4e6d8",
     "type": "set",
     "name": "set source ttp-id",
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4708.683853149414,
-    "y": 1396.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4650.683853149414,
+    "y": 1418.426025390625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e4841ff6.3e7e08",
+    "id": "778cb9b9.8f8fe8",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4705.683853149414,
-    "y": 1435.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4647.683853149414,
+    "y": 1457.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "766fb473.2a452c"
+        "ec4224f7.9e7cd8"
       ]
     ]
   },
   {
-    "id": "5d11c4a6.df68cc",
+    "id": "bf204b7b.9bfdb",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4661.183853149414,
-    "y": 1477.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4603.183853149414,
+    "y": 1499.426025390625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "766fb473.2a452c",
+    "id": "ec4224f7.9e7cd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4886.183853149414,
-    "y": 1434.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4828.183853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "91f25d9a.835d38"
+        "582de34f.7fb28c"
       ]
     ]
   },
   {
-    "id": "cce9c2da.fea888",
+    "id": "594a82b5.27abf4",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4798.566909790039,
-    "y": 1198.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4740.566909790039,
+    "y": 1220.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7f9c2923.089b6"
+        "66078b.852b6874"
       ]
     ]
   },
   {
-    "id": "7f9c2923.089b6",
+    "id": "66078b.852b6874",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4975.566909790039,
-    "y": 1190.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4917.566909790039,
+    "y": 1212.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "713d1c50.32082c",
-        "1fe6b234.c7fd7e"
+        "845ac8fd.748f28",
+        "83b24a05.2f8a"
       ]
     ]
   },
   {
-    "id": "491c14e2.9cc81c",
+    "id": "4c952f98.568af8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4595.566909790039,
-    "y": 1194.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4537.566909790039,
+    "y": 1216.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cce9c2da.fea888",
-        "181e2b72.5adced"
+        "594a82b5.27abf4",
+        "5ed6730.6c8c00c"
       ]
     ]
   },
   {
-    "id": "181e2b72.5adced",
+    "id": "5ed6730.6c8c00c",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4664.566909790039,
-    "y": 1268.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4606.566909790039,
+    "y": 1290.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ef7391a.b132a8"
+        "4c5161e.9fd722"
       ]
     ]
   },
   {
-    "id": "5ef7391a.b132a8",
+    "id": "4c5161e.9fd722",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4860.566909790039,
-    "y": 1268.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4802.566909790039,
+    "y": 1290.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1d2757a1.42bf3"
+        "56b33693.b47598"
       ]
     ]
   },
   {
-    "id": "91f25d9a.835d38",
+    "id": "582de34f.7fb28c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5044.183853149414,
-    "y": 1434.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4986.183853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "83fb3b54.d5c3d"
+        "85577907.9676c"
       ]
     ]
   },
   {
-    "id": "83fb3b54.d5c3d",
+    "id": "85577907.9676c",
     "type": "set",
     "name": "set source tunnel tp ip",
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5251.183853149414,
-    "y": 1434.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 5193.183853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1fe6b234.c7fd7e",
+    "id": "83b24a05.2f8a",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5200.566909790039,
-    "y": 1186.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5142.566909790039,
+    "y": 1208.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f445a11a.71bc2",
-        "1ca051d1.62d8c6",
-        "b5779702.ec152"
+        "713c5be.b2c37a4",
+        "d56276.26041588",
+        "196389ff.ab755e"
       ]
     ]
   },
   {
-    "id": "713d1c50.32082c",
+    "id": "845ac8fd.748f28",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5230.566909790039,
-    "y": 1134.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5172.566909790039,
+    "y": 1156.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f445a11a.71bc2",
+    "id": "713c5be.b2c37a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5410.566909790039,
-    "y": 1177.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5352.566909790039,
+    "y": 1199.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "97cfd71c.893b9"
+        "d0702051.0907f"
       ]
     ]
   },
   {
-    "id": "1ca051d1.62d8c6",
+    "id": "d56276.26041588",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.566909790039,
-    "y": 1232.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5344.566909790039,
+    "y": 1254.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f71936fa.5c6ed8"
+        "8b99771a.c5d7d8"
       ]
     ]
   },
   {
-    "id": "b5779702.ec152",
+    "id": "196389ff.ab755e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5407.566909790039,
-    "y": 1289.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5349.566909790039,
+    "y": 1311.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2f95de59.c21562"
+        "a51c05da.8af508"
       ]
     ]
   },
   {
-    "id": "2f95de59.c21562",
+    "id": "a51c05da.8af508",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5559.566909790039,
-    "y": 1290.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5501.566909790039,
+    "y": 1312.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f71936fa.5c6ed8",
+    "id": "8b99771a.c5d7d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5570.566909790039,
-    "y": 1235.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5512.566909790039,
+    "y": 1257.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "97cfd71c.893b9",
+    "id": "d0702051.0907f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5554.949234008789,
-    "y": 1174.941421508789,
-    "z": "3edf77d7.add3c",
+    "x": 5496.949234008789,
+    "y": 1196.7413635253906,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3725abc9.8fe81c"
+        "2f7031d3.9cf0ee"
       ]
     ]
   },
   {
-    "id": "1d2757a1.42bf3",
+    "id": "56b33693.b47598",
     "type": "set",
     "name": "set domainA ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5123.566909790039,
-    "y": 1271.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5065.566909790039,
+    "y": 1293.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3725abc9.8fe81c",
+    "id": "2f7031d3.9cf0ee",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5741.566909790039,
-    "y": 1171.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5683.566909790039,
+    "y": 1193.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "67aa7525.7bae1c",
+    "id": "f189d378.846e88",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4382.566177368164,
-    "y": 406.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4324.566177368164,
+    "y": 428.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "18cc69a3.9aa206",
+    "id": "b971caad.98e088",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4373.566177368164,
-    "y": 504.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4315.566177368164,
+    "y": 526.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "47912c0e.49beac",
+    "id": "7ce464fa.676414",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4207.566177368164,
-    "y": 412.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4149.566177368164,
+    "y": 434.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8d16f671.5b9d4",
-        "67aa7525.7bae1c"
+        "69d167e5.40c62",
+        "f189d378.846e88"
       ]
     ]
   },
   {
-    "id": "eb199d13.e7038",
+    "id": "6bd6b0d9.b558a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4213.566177368164,
-    "y": 476.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4155.566177368164,
+    "y": 498.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5b74c380.dcc8d4",
-        "18cc69a3.9aa206"
+        "e079feb5.4893f8",
+        "b971caad.98e088"
       ]
     ]
   },
   {
-    "id": "ab328b3c.b23248",
+    "id": "6918e709.d57e78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4227.565933227539,
-    "y": 640.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4169.565933227539,
+    "y": 662.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "142c8c33.b05574",
-        "53d3049.af6e8fc"
+        "81aa5c4a.edfc28",
+        "94706e58.1662e"
       ]
     ]
   },
   {
-    "id": "4b33e71e.9ca98",
+    "id": "688d98a0.dbdc1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4230.565933227539,
-    "y": 693.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4172.565933227539,
+    "y": 715.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fadd6db5.8e746",
-        "2cd10454.6fd4ec"
+        "3e901a8b.2e5bae",
+        "fa86abe3.b1432"
       ]
     ]
   },
   {
-    "id": "53d3049.af6e8fc",
+    "id": "94706e58.1662e",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4449.565933227539,
-    "y": 707.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4391.565933227539,
+    "y": 729.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2cd10454.6fd4ec",
+    "id": "fa86abe3.b1432",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4452.565933227539,
-    "y": 798.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4394.565933227539,
+    "y": 820.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4fd998b7.acd798",
+    "id": "86d40228.e6791",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3608.566665649414,
-    "y": 1744.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3550.566665649414,
+    "y": 1766.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "de0c38ee.f76ef8",
-        "25935580.28bbea"
+        "6a32c154.ba6f4",
+        "1782aa9f.237955"
       ]
     ]
   },
   {
-    "id": "170f6ee1.76ff39",
+    "id": "9ec80efb.c2577",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3435.900161743164,
-    "y": 1745.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3377.900161743164,
+    "y": 1767.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4fd998b7.acd798"
+        "86d40228.e6791"
       ]
     ]
   },
   {
-    "id": "6aad81bd.cb4268",
+    "id": "43e3fed6.1297b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3445.391128540039,
-    "y": 1787.8597869873047,
-    "z": "3edf77d7.add3c",
+    "x": 3387.391128540039,
+    "y": 1809.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "54bd0023.9501c8"
+        "334a1379.e9843c"
       ]
     ]
   },
   {
-    "id": "e02aca99.393958",
+    "id": "1f47b68f.a8eef1",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3433.900161743164,
-    "y": 1834.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3375.900161743164,
+    "y": 1856.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "20e4fbbc.46dd64"
+        "5bb133ac.e78e0c"
       ]
     ]
   },
   {
-    "id": "54bd0023.9501c8",
+    "id": "334a1379.e9843c",
     "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": 3598.9625396728516,
-    "y": 1791.145523071289,
-    "z": "3edf77d7.add3c",
+    "x": 3540.9625396728516,
+    "y": 1812.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "20e4fbbc.46dd64",
+    "id": "5bb133ac.e78e0c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3602.900161743164,
-    "y": 1835.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3544.900161743164,
+    "y": 1857.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "de0c38ee.f76ef8",
+    "id": "6a32c154.ba6f4",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3894.900161743164,
-    "y": 1748.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3836.900161743164,
+    "y": 1770.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "36c6c2be.762bee",
-        "9dad2b66.a09d3"
+        "ca43a356.ba0b08",
+        "e66d0b8d.a97b4"
       ]
     ]
   },
   {
-    "id": "9dad2b66.a09d3",
+    "id": "e66d0b8d.a97b4",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.900161743164,
-    "y": 1703.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4059.900161743164,
+    "y": 1725.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "36a66ce5.93da74"
+        "fd8de530.926928"
       ]
     ]
   },
   {
-    "id": "36c6c2be.762bee",
+    "id": "ca43a356.ba0b08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4119.900161743164,
-    "y": 1767.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4061.900161743164,
+    "y": 1789.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4c6cb6f3.89667"
+        "ac8c9391.216608"
       ]
     ]
   },
   {
-    "id": "4c6cb6f3.89667",
+    "id": "ac8c9391.216608",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4278.900161743164,
-    "y": 1786.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4220.900161743164,
+    "y": 1808.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "36a66ce5.93da74",
+    "id": "fd8de530.926928",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4282.900161743164,
-    "y": 1700.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4224.900161743164,
+    "y": 1722.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5a5e37bd.3076e",
-        "6e346008.c0c8d"
+        "23cc210e.ee0c06",
+        "6fca06b.e0d07f8"
       ]
     ]
   },
   {
-    "id": "63476979.041bd8",
+    "id": "8c4c723a.871028",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3207.900161743164,
-    "y": 1780.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3149.900161743164,
+    "y": 1802.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "170f6ee1.76ff39",
-        "6aad81bd.cb4268",
-        "e02aca99.393958"
+        "9ec80efb.c2577",
+        "43e3fed6.1297b8",
+        "1f47b68f.a8eef1"
       ]
     ]
   },
   {
-    "id": "dbdf27a7.fc5e4",
+    "id": "24043c86.21d3b4",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3168.900161743164,
-    "y": 1724.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3110.900161743164,
+    "y": 1746.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "35531714.c0e89",
+    "id": "b53436ed.4e5d8",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3220.900161743164,
-    "y": 1526.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3162.900161743164,
+    "y": 1548.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1026191c.92617f",
-        "af47cd19.1e85a"
+        "b0d17fd7.22179",
+        "dd9d4fb5.ef81d"
       ]
     ]
   },
   {
-    "id": "af47cd19.1e85a",
+    "id": "dd9d4fb5.ef81d",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3443.900161743164,
-    "y": 1512.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3385.900161743164,
+    "y": 1534.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "79bebb4c.23a30c"
+        "b04c1433.ec2b4"
       ]
     ]
   },
   {
-    "id": "1026191c.92617f",
+    "id": "b0d17fd7.22179",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3445.900161743164,
-    "y": 1545.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3387.900161743164,
+    "y": 1567.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f83e847f.4ec13"
+        "774ab139.4714d"
       ]
     ]
   },
   {
-    "id": "f83e847f.4ec13",
+    "id": "774ab139.4714d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3588.900161743164,
-    "y": 1542.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3530.900161743164,
+    "y": 1564.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "79bebb4c.23a30c",
+    "id": "b04c1433.ec2b4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3591.900161743164,
-    "y": 1505.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3533.900161743164,
+    "y": 1527.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3fb5f800.679e",
-        "4b785447.3b4bdc"
+        "1e9a896f.f9bc1f",
+        "93b99c7d.fb3988"
       ]
     ]
   },
   {
-    "id": "3fb5f800.679e",
+    "id": "1e9a896f.f9bc1f",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3785.900161743164,
-    "y": 1508.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3727.900161743164,
+    "y": 1530.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "25935580.28bbea",
+    "id": "1782aa9f.237955",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3838.900161743164,
-    "y": 1867.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3780.900161743164,
+    "y": 1889.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e6fe79a3.e9ea5"
+        "2e3481a6.9bb10e"
       ]
     ]
   },
   {
-    "id": "e6fe79a3.e9ea5",
+    "id": "2e3481a6.9bb10e",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4044.900161743164,
-    "y": 1867.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3986.900161743164,
+    "y": 1889.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "122e4fb.7ae86b"
+        "6540c5f1.0a5994"
       ]
     ]
   },
   {
-    "id": "122e4fb.7ae86b",
+    "id": "6540c5f1.0a5994",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4262.185806274414,
-    "y": 1866.1075286865234,
-    "z": "3edf77d7.add3c",
+    "x": 4204.185806274414,
+    "y": 1887.907470703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "837cca48.ec2188"
+        "95bcf360.d32c3"
       ]
     ]
   },
   {
-    "id": "4b785447.3b4bdc",
+    "id": "93b99c7d.fb3988",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3807.900161743164,
-    "y": 1576.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3749.900161743164,
+    "y": 1598.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c81ddea8.acca2",
-        "677cee1e.585708",
-        "5b3f6a5a.a599cc"
+        "56130ba2.c1cf54",
+        "ae8939cc.fc31",
+        "2a03aebc.9defb2"
       ]
     ]
   },
   {
-    "id": "c81ddea8.acca2",
+    "id": "56130ba2.c1cf54",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4003.4002838134766,
-    "y": 1528.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3945.4002838134766,
+    "y": 1550.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4e15930.1f2346c"
+        "d6a55773.4a4c"
       ]
     ]
   },
   {
-    "id": "677cee1e.585708",
+    "id": "ae8939cc.fc31",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3995.4002838134766,
-    "y": 1583.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3937.4002838134766,
+    "y": 1605.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "77c7f195.03bd88"
+        "9b459bcd.2098d"
       ]
     ]
   },
   {
-    "id": "5b3f6a5a.a599cc",
+    "id": "2a03aebc.9defb2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4000.4002838134766,
-    "y": 1640.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3942.4002838134766,
+    "y": 1662.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "44cfcdb.eef3bb4"
+        "649fe73e.2ce088"
       ]
     ]
   },
   {
-    "id": "44cfcdb.eef3bb4",
+    "id": "649fe73e.2ce088",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4152.400283813477,
-    "y": 1641.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4094.4002838134766,
+    "y": 1663.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "77c7f195.03bd88",
+    "id": "9b459bcd.2098d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4163.400283813477,
-    "y": 1586.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4105.400283813477,
+    "y": 1608.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4e15930.1f2346c",
+    "id": "d6a55773.4a4c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4147.782608032227,
-    "y": 1525.9415435791016,
-    "z": "3edf77d7.add3c",
+    "x": 4089.7826080322266,
+    "y": 1547.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3bb66f6b.2423e"
+        "bede9152.115d78"
       ]
     ]
   },
   {
-    "id": "5a5e37bd.3076e",
+    "id": "23cc210e.ee0c06",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
     "comments": "",
-    "x": 4452.900161743164,
-    "y": 1661.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4394.900161743164,
+    "y": 1683.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6e346008.c0c8d",
+    "id": "6fca06b.e0d07f8",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
     "comments": "",
-    "x": 4453.900161743164,
-    "y": 1766.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4395.900161743164,
+    "y": 1788.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f684cc96.93a36",
+    "id": "69bceee8.94dc1",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4448.900161743164,
-    "y": 1715.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4390.900161743164,
+    "y": 1737.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "837cca48.ec2188",
+    "id": "95bcf360.d32c3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4469.017349243164,
-    "y": 1855.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4411.017349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4370bd5a.9f5934",
-        "1bda5a20.b54946",
-        "7ecac2a.84cd6bc"
+        "d7309d49.1473f8",
+        "2eed2e93.5097fa",
+        "930eaed5.6d5ba"
       ]
     ]
   },
   {
-    "id": "4370bd5a.9f5934",
+    "id": "d7309d49.1473f8",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4684.017349243164,
-    "y": 1817.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4626.017349243164,
+    "y": 1839.4261474609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1bda5a20.b54946",
+    "id": "2eed2e93.5097fa",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4681.017349243164,
-    "y": 1856.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4623.017349243164,
+    "y": 1878.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e1da362d.0aaf38"
+        "2f95459c.265a5a"
       ]
     ]
   },
   {
-    "id": "7ecac2a.84cd6bc",
+    "id": "930eaed5.6d5ba",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4636.517349243164,
-    "y": 1898.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4578.517349243164,
+    "y": 1920.4261474609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e1da362d.0aaf38",
+    "id": "2f95459c.265a5a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4861.517349243164,
-    "y": 1855.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4803.517349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4842e5f.6c9081c"
+        "d078b0a.68a52d"
       ]
     ]
   },
   {
-    "id": "4842e5f.6c9081c",
+    "id": "d078b0a.68a52d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5019.517349243164,
-    "y": 1855.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4961.517349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d2ac7d5.8c2918"
+        "30e98951.5e07a6"
       ]
     ]
   },
   {
-    "id": "d2ac7d5.8c2918",
+    "id": "30e98951.5e07a6",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5226.517349243164,
-    "y": 1855.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 5168.517349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d8873c57.456df",
+    "id": "981701b9.ec871",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4729.900161743164,
-    "y": 1544.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4671.900161743164,
+    "y": 1566.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bf2c165b.0d277"
+        "d77b06b.6f4d6f8"
       ]
     ]
   },
   {
-    "id": "bf2c165b.0d277",
+    "id": "d77b06b.6f4d6f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4906.900161743164,
-    "y": 1536.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4848.900161743164,
+    "y": 1558.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7f001b92.6c2014",
-        "47ea9781.67241"
+        "3a0f923c.08de3e",
+        "973e1032.2176f8"
       ]
     ]
   },
   {
-    "id": "3bb66f6b.2423e",
+    "id": "bede9152.115d78",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4331.900161743164,
-    "y": 1540.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4273.900161743164,
+    "y": 1562.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c9ef5f55.13159"
+        "fdc36db2.a87e28"
       ]
     ]
   },
   {
-    "id": "c9ef5f55.13159",
+    "id": "fdc36db2.a87e28",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4526.900161743164,
-    "y": 1540.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4468.900161743164,
+    "y": 1562.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d8873c57.456df",
-        "e212cfa3.d9b94"
+        "981701b9.ec871",
+        "be6d1ad1.f19078"
       ]
     ]
   },
   {
-    "id": "47ea9781.67241",
+    "id": "973e1032.2176f8",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5114.900161743164,
-    "y": 1543.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5056.900161743164,
+    "y": 1565.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "46f5dd83.067904",
-        "97b572f2.cabba",
-        "90953f01.0039c"
+        "ca9140fb.c087c8",
+        "6d0312aa.d002b4",
+        "f05eee5.baf501"
       ]
     ]
   },
   {
-    "id": "666bc3f3.f942ac",
+    "id": "6e647d31.2d49bc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4908.900161743164,
-    "y": 1609.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4850.900161743164,
+    "y": 1631.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "af972400.78ec68"
+        "e3a19b14.5a697"
       ]
     ]
   },
   {
-    "id": "e212cfa3.d9b94",
+    "id": "be6d1ad1.f19078",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4731.900161743164,
-    "y": 1617.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4673.900161743164,
+    "y": 1639.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "666bc3f3.f942ac"
+        "6e647d31.2d49bc"
       ]
     ]
   },
   {
-    "id": "7f001b92.6c2014",
+    "id": "3a0f923c.08de3e",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5144.900161743164,
-    "y": 1491.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5086.900161743164,
+    "y": 1513.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "af972400.78ec68",
+    "id": "e3a19b14.5a697",
     "type": "set",
     "name": "set domainB ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5090.900161743164,
-    "y": 1673.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5032.900161743164,
+    "y": 1695.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "46f5dd83.067904",
+    "id": "ca9140fb.c087c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5324.900161743164,
-    "y": 1534.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5266.900161743164,
+    "y": 1556.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9ccd655c.46849"
+        "b8d407f0.fa2f2"
       ]
     ]
   },
   {
-    "id": "97b572f2.cabba",
+    "id": "6d0312aa.d002b4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5316.900161743164,
-    "y": 1589.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5258.900161743164,
+    "y": 1611.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4f6c8e9e.87ef88"
+        "4b944ffd.e25418"
       ]
     ]
   },
   {
-    "id": "90953f01.0039c",
+    "id": "f05eee5.baf501",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5321.900161743164,
-    "y": 1646.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5263.900161743164,
+    "y": 1668.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5fa05e22.fdafa8"
+        "ee8e04d7.272aa8"
       ]
     ]
   },
   {
-    "id": "5fa05e22.fdafa8",
+    "id": "ee8e04d7.272aa8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5473.900161743164,
-    "y": 1647.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5415.900161743164,
+    "y": 1669.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4f6c8e9e.87ef88",
+    "id": "4b944ffd.e25418",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5484.900161743164,
-    "y": 1592.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5426.900161743164,
+    "y": 1614.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9ccd655c.46849",
+    "id": "b8d407f0.fa2f2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5469.282485961914,
-    "y": 1531.9415435791016,
-    "z": "3edf77d7.add3c",
+    "x": 5411.282485961914,
+    "y": 1553.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9bc41fad.100098"
+        "6d9ea0b0.8eb598"
       ]
     ]
   },
   {
-    "id": "9bc41fad.100098",
+    "id": "6d9ea0b0.8eb598",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5683.900161743164,
-    "y": 1528.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5625.900161743164,
+    "y": 1550.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "aac95e09.ab90b8",
+    "id": "af5ed41e.3d53d8",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3272.566665649414,
-    "y": 1350.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3214.566665649414,
+    "y": 1372.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c158f2ac.9bf138",
+    "id": "8ca11cdb.f07238",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4549.566177368164,
-    "y": 490.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4491.566177368164,
+    "y": 512.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1c9be409.368d34",
+    "id": "d8ad8c3e.d0237",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4617.565933227539,
-    "y": 692.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4559.565933227539,
+    "y": 714.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d36e02ea.349dc",
+    "id": "ad7d5348.0e5498",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3168.566665649414,
-    "y": 1911.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3110.566665649414,
+    "y": 1933.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ad429900.4c716",
+    "id": "36740b66.98fa4c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3430.566665649414,
-    "y": 2824.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3372.566665649414,
+    "y": 2846.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "456e0186.bd36f8",
+    "id": "344dee20.fc9faa",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3307.566665649414,
-    "y": 2934.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3249.566665649414,
+    "y": 2956.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1a6260f2.b38e77",
-        "151ade37.c8cbba"
+        "ae20b5d5.d95098",
+        "c9495f1c.3bc2f8"
       ]
     ]
   },
   {
-    "id": "1a6260f2.b38e77",
+    "id": "ae20b5d5.d95098",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3491.566665649414,
-    "y": 2913.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3433.566665649414,
+    "y": 2935.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ba23a41e.50085"
+        "dbad0754.935cf"
       ]
     ]
   },
   {
-    "id": "151ade37.c8cbba",
+    "id": "c9495f1c.3bc2f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3027.566665649414,
-    "y": 4499.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 2969.566665649414,
+    "y": 4521.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f3de805.eee03"
+        "89fb91c7.4bd6f"
       ]
     ]
   },
   {
-    "id": "e429a394.1622b",
+    "id": "10e6ecec.11b933",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3538.566665649414,
-    "y": 5084.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3480.566665649414,
+    "y": 5106.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ee345eb7.dd48b",
-        "78110e1d.34a828",
-        "399c8052.14794",
-        "7855b68f.e847e",
-        "7a90992b.99ef7",
-        "2987a87c.d9af38"
+        "965aea89.b04fc8",
+        "f18404c6.f7135",
+        "e65dde18.8f2e28",
+        "1e648504.a919f3",
+        "518cc181.03ac48",
+        "3f0ddd6.f3f1022"
       ]
     ]
   },
   {
-    "id": "ba23a41e.50085",
+    "id": "dbad0754.935cf",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6204.566665649414,
-    "y": 1733.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6146.566665649414,
+    "y": 1755.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "18ef4940.2cc947",
-        "10bd34b9.d586b3",
-        "c874118.0dda17",
-        "e01a8555.4482f8",
-        "48a8a99c.f1479",
-        "65f7f754.67c0f8",
-        "a9eb431c.c27b3",
-        "9d81d981.8859c8",
-        "9ef240b6.5338",
-        "56d51e0c.3fbb48",
-        "f1e4ada5.0d8a28",
-        "9aa0ecc9.b21a38",
-        "1d111c3e.37b394",
-        "b8b78e91.784a68",
-        "43c8a40f.539994",
-        "b8201609.6ece6",
-        "6d3e15fd.90249c",
-        "7bb73f8a.b1ab48",
-        "c917b2c2.68a8d",
-        "f8b29c6c.19b2e8",
-        "374c089f.fa2538",
-        "c9cb4066.4924"
+        "36824bf8.d68ef4",
+        "2dc163c.5688f1c",
+        "aefc0847.3297e8",
+        "f9d64859.5035b",
+        "378565ef.1147ba",
+        "ea2b2456.c327d",
+        "41693c79.da7d5c",
+        "632a01d1.5b8d1",
+        "3ebd5a04.12a166",
+        "f08579e.3888c08",
+        "c49cd07d.45dca",
+        "64b31039.d88b18",
+        "9f309da2.930198",
+        "bc5b333d.5b219",
+        "4ee4ed66.f0512c",
+        "11738810.45add",
+        "997f20e4.966598",
+        "90ca3b9e.d9782",
+        "99bc893b.a732e",
+        "98d8658a.1dab08",
+        "d8f4cd5c.153e9",
+        "96928e3.987df7"
       ]
     ]
   },
   {
-    "id": "9ef240b6.5338",
+    "id": "3ebd5a04.12a166",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainB",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6575.566665649414,
-    "y": 1656.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6517.566665649414,
+    "y": 1678.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "18ef4940.2cc947",
+    "id": "36824bf8.d68ef4",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6529.566665649414,
-    "y": 1754.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6471.566665649414,
+    "y": 1776.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "10bd34b9.d586b3",
+    "id": "2dc163c.5688f1c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6665.566665649414,
-    "y": 1801.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6607.566665649414,
+    "y": 1823.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "577f8c89.2e206c",
+    "id": "c7f7058b.2d43",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6496.566665649414,
-    "y": 1605.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6438.566665649414,
+    "y": 1627.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "267ba619.c9af8a",
+    "id": "288fb927.99235e",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 6992.566665649414,
-    "y": 2341.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6934.566665649414,
+    "y": 2363.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c874118.0dda17",
+    "id": "aefc0847.3297e8",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6556.566665649414,
-    "y": 2380.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6498.566665649414,
+    "y": 2402.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "e01a8555.4482f8",
+    "id": "f9d64859.5035b",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6504.566665649414,
-    "y": 2431.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6446.566665649414,
+    "y": 2453.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "48a8a99c.f1479",
+    "id": "378565ef.1147ba",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6640.566665649414,
-    "y": 2478.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6582.566665649414,
+    "y": 2500.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "52e24832.034e88",
+    "id": "718897ce.fb3b1",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6497.566665649414,
-    "y": 2340.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6439.566665649414,
+    "y": 2362.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "debe9e97.cd8f",
+    "id": "42817fe0.95098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6927.566665649414,
-    "y": 2537.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6869.566665649414,
+    "y": 2559.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "65f7f754.67c0f8",
+    "id": "ea2b2456.c327d",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 6518.566665649414,
-    "y": 2584.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6460.566665649414,
+    "y": 2606.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "85091e88.c72c7",
-        "7dba75fe.6c5c54",
-        "3df3f46e.6f2edc"
+        "7708ed16.f5264c",
+        "77c895d1.87f4a4",
+        "866d7f4e.404768"
       ]
     ]
   },
   {
-    "id": "85091e88.c72c7",
+    "id": "7708ed16.f5264c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6765.566665649414,
-    "y": 2538.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6707.566665649414,
+    "y": 2560.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "debe9e97.cd8f"
+        "42817fe0.95098"
       ]
     ]
   },
   {
-    "id": "7dba75fe.6c5c54",
+    "id": "77c895d1.87f4a4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6766.057632446289,
-    "y": 2583.8597869873047,
-    "z": "3edf77d7.add3c",
+    "x": 6708.057632446289,
+    "y": 2605.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3c115d7c.ba4cb2"
+        "372888d7.b266f8"
       ]
     ]
   },
   {
-    "id": "3df3f46e.6f2edc",
+    "id": "866d7f4e.404768",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6763.566665649414,
-    "y": 2627.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6705.566665649414,
+    "y": 2649.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3193d0af.6d5de8"
+        "5cb60ec5.ffb7e8"
       ]
     ]
   },
   {
-    "id": "3c115d7c.ba4cb2",
+    "id": "372888d7.b266f8",
     "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": 6928.629043579102,
-    "y": 2584.145523071289,
-    "z": "3edf77d7.add3c",
+    "x": 6870.629043579102,
+    "y": 2605.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3193d0af.6d5de8",
+    "id": "5cb60ec5.ffb7e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 6932.566665649414,
-    "y": 2628.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6874.566665649414,
+    "y": 2650.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "43c8a40f.539994",
+    "id": "4ee4ed66.f0512c",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6572.566665649414,
-    "y": 2900.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6514.566665649414,
+    "y": 2922.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b8201609.6ece6",
+    "id": "11738810.45add",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6575.566665649414,
-    "y": 2945.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6517.566665649414,
+    "y": 2967.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "7bb73f8a.b1ab48",
+    "id": "90ca3b9e.d9782",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6567.566665649414,
-    "y": 2699.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6509.566665649414,
+    "y": 2721.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c917b2c2.68a8d",
+    "id": "99bc893b.a732e",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6569.566665649414,
-    "y": 2746.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6511.566665649414,
+    "y": 2768.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "8bd704e.d0521f8",
+    "id": "ce999bfb.8752f",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6488.566665649414,
-    "y": 2853.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6430.566665649414,
+    "y": 2875.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e06e4d85.94c0f8",
+    "id": "618f9b48.ad8ea4",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4488.566909790039,
-    "y": 5246.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4430.566909790039,
+    "y": 5268.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ee345eb7.dd48b",
+    "id": "965aea89.b04fc8",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3753.566665649414,
-    "y": 5065.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3695.566665649414,
+    "y": 5087.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c561431f.f6e0f",
-        "49468e15.59ced"
+        "c53bf166.c2e718",
+        "936c4fdb.103588"
       ]
     ]
   },
   {
-    "id": "49468e15.59ced",
+    "id": "936c4fdb.103588",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3925.566665649414,
-    "y": 5062.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3867.566665649414,
+    "y": 5084.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "997265fa.7d7f1"
+        "8b1c5fc9.627c"
       ]
     ]
   },
   {
-    "id": "c561431f.f6e0f",
+    "id": "c53bf166.c2e718",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3877.566665649414,
-    "y": 5909.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3819.566665649414,
+    "y": 5931.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e1ebd454.f4cdb8"
+        "eab327e7.a5f748"
       ]
     ]
   },
   {
-    "id": "604349fc.e0a658",
+    "id": "3f493e72.b6d702",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3938.566665649414,
-    "y": 5032.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3880.566665649414,
+    "y": 5054.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8edd5f5.78488a",
+    "id": "4859c2db.d9b9e4",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3948.566665649414,
-    "y": 5867.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3890.566665649414,
+    "y": 5889.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a9eb431c.c27b3",
+    "id": "41693c79.da7d5c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6574.566665649414,
-    "y": 3079.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6516.566665649414,
+    "y": 3101.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "997265fa.7d7f1",
+    "id": "8b1c5fc9.627c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4101.566665649414,
-    "y": 5064.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4043.566665649414,
+    "y": 5086.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bcf60ed5.161338",
-        "8a063d24.55e818",
-        "27d5e3fa.d1fc64",
-        "eb431097.375ee8",
-        "146ee230.44ecc6",
-        "a86e4db4.94773",
-        "e06e4d85.94c0f8",
-        "b311bb82.023748",
-        "f2f4b1c2.9aee8"
+        "a815fc28.26a0f",
+        "8b2580e9.dc4908",
+        "63429691.f224b",
+        "2532ed2.07c3292",
+        "d070f297.71c91",
+        "d66ee6cb.59aee8",
+        "618f9b48.ad8ea4",
+        "4f6ebd11.7928d4",
+        "53cb53b2.198aa4"
       ]
     ]
   },
   {
-    "id": "5b2e4a79.26fcd4",
+    "id": "7eea77d.c16dd08",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5545.566421508789,
-    "y": 4989.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5487.566421508789,
+    "y": 5011.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bcf60ed5.161338",
+    "id": "a815fc28.26a0f",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4347.566909790039,
-    "y": 5745.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4289.566909790039,
+    "y": 5767.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d81d981.8859c8",
+    "id": "632a01d1.5b8d1",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6581.566665649414,
-    "y": 1995.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6523.566665649414,
+    "y": 2017.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "2ed6ffae.15a9",
+    "id": "5eff9d93.842974",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",
     "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",
     "comments": "",
-    "x": 6631.566665649414,
-    "y": 1698.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6573.566665649414,
+    "y": 1720.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "56d51e0c.3fbb48",
+    "id": "f08579e.3888c08",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6578.566665649414,
-    "y": 1286.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6520.566665649414,
+    "y": 1308.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f1e4ada5.0d8a28",
+    "id": "c49cd07d.45dca",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6526.566665649414,
-    "y": 1334.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6468.566665649414,
+    "y": 1356.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9aa0ecc9.b21a38",
+    "id": "64b31039.d88b18",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6654.566665649414,
-    "y": 1381.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6596.566665649414,
+    "y": 1403.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "59c3b9a9.bee328",
+    "id": "6013e30e.dd851c",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6491.566665649414,
-    "y": 1244.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6433.566665649414,
+    "y": 1266.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1d111c3e.37b394",
+    "id": "9f309da2.930198",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6488.566665649414,
-    "y": 1472.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6430.566665649414,
+    "y": 1494.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b8b78e91.784a68",
+    "id": "bc5b333d.5b219",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6581.566665649414,
-    "y": 1525.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6523.566665649414,
+    "y": 1547.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b1590465.c06e9",
+    "id": "cdd019be.ce295",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6472.566665649414,
-    "y": 1428.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6414.566665649414,
+    "y": 1450.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4fd8fae5.4af44c",
+    "id": "aeaa5a0f.0b3cf",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6478.566665649414,
-    "y": 1878.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6420.566665649414,
+    "y": 1900.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "eb431097.375ee8",
+    "id": "2532ed2.07c3292",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4414.566421508789,
-    "y": 4997.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4356.566421508789,
+    "y": 5019.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "111c6f80.d662f1",
+    "id": "3a34d279.a99216",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4398.566421508789,
-    "y": 4953.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4340.566421508789,
+    "y": 4975.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f6ae128e.43e818",
+    "id": "4c6450c4.cdb8b8",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5145.566421508789,
-    "y": 4984.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5087.566421508789,
+    "y": 5006.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "273e73f0.d7fa54",
+    "id": "d6b231ff.4e48",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5232.566421508789,
-    "y": 5026.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5174.566421508789,
+    "y": 5048.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "78d97bc5.d96984",
+    "id": "e479d260.5097c",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5180.566421508789,
-    "y": 5074.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5122.566421508789,
+    "y": 5096.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "464f510d.72c448",
+    "id": "c8a578a.1c83e08",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5308.566421508789,
-    "y": 5121.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5250.566421508789,
+    "y": 5143.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a86e4db4.94773",
+    "id": "d66ee6cb.59aee8",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4476.566909790039,
-    "y": 5288.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4418.566909790039,
+    "y": 5310.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "da1f3bba.7aa878",
+    "id": "85a1c373.0d0068",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4459.566909790039,
-    "y": 5350.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4401.566909790039,
+    "y": 5372.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8a063d24.55e818",
+    "id": "8b2580e9.dc4908",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4570.566909790039,
-    "y": 5392.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4512.566909790039,
+    "y": 5414.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "cfd66aba.0bb4b",
+    "id": "2bc22db1.d483d2",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5027.566421508789,
-    "y": 5563.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4969.566421508789,
+    "y": 5585.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d34f3733.82b438",
+    "id": "47c00ee.a0fdbf",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4337.566421508789,
-    "y": 6261.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4279.566421508789,
+    "y": 6283.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a5e6b4f4.57a38",
+    "id": "afc7e373.9dd788",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4270.566421508789,
-    "y": 6215.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4212.566421508789,
+    "y": 6237.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea2fb779.5cdf1",
+    "id": "13eeaed2.223169",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4219.566421508789,
-    "y": 6166.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4161.566421508789,
+    "y": 6188.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cea8b041.47c29",
+    "id": "9fd3ad0c.c5f0a",
     "type": "save",
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5002.566665649414,
-    "y": 6372.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4944.566665649414,
+    "y": 6394.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "27d5e3fa.d1fc64",
+    "id": "63429691.f224b",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4397.566909790039,
-    "y": 5449.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4339.566909790039,
+    "y": 5471.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "76f33e89.9589e",
-        "2dcff9f1.2ed2e6"
+        "4766abce.851ac4",
+        "ca35b158.85d38"
       ]
     ]
   },
   {
-    "id": "76f33e89.9589e",
+    "id": "4766abce.851ac4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4608.566909790039,
-    "y": 5449.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4550.566909790039,
+    "y": 5471.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "53185310.1e3aac"
+        "2ab4c487.b40124"
       ]
     ]
   },
   {
-    "id": "53185310.1e3aac",
+    "id": "2ab4c487.b40124",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4764.566909790039,
-    "y": 5445.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4706.566909790039,
+    "y": 5467.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cfd66aba.0bb4b",
-        "d5527664.91c39",
-        "7871c32f.9d91cc"
+        "2bc22db1.d483d2",
+        "b27ea187.400a38",
+        "ca1c65a6.dca85"
       ]
     ]
   },
   {
-    "id": "2dcff9f1.2ed2e6",
+    "id": "ca35b158.85d38",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4604.566909790039,
-    "y": 5497.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4546.566909790039,
+    "y": 5519.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "74066864.f6923"
+        "e1bf2cff.d57f2"
       ]
     ]
   },
   {
-    "id": "74066864.f6923",
+    "id": "e1bf2cff.d57f2",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 4752.566909790039,
-    "y": 5492.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4694.566909790039,
+    "y": 5514.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3e678579.1103ca",
+    "id": "b408049f.7933a",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5269.566421508789,
-    "y": 5192.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5211.566421508789,
+    "y": 5214.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1902c403.6fb814",
+    "id": "4f8a0bf3.f76a6c",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2436.566665649414,
-    "y": 151.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2378.566665649414,
+    "y": 173.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b21e9d77.e0db",
+    "id": "6a76544b.f753cc",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 2370.566665649414,
-    "y": 187.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2312.566665649414,
+    "y": 209.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9b031e24.c71f38",
+    "id": "23b662d9.16701e",
     "type": "comment",
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
     "info": "",
     "comments": "",
-    "x": 2555.566665649414,
-    "y": 114.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2497.566665649414,
+    "y": 136.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2b3dd3ef.75d514",
+    "id": "3d0b458a.f9a2a2",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 4304.566421508789,
-    "y": 6327.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4246.566421508789,
+    "y": 6349.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "44cea2e2.e10b04",
+    "id": "a3e7b437.8026b",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4437.566421508789,
-    "y": 6375.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4379.566421508789,
+    "y": 6397.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "32da350f.e91202",
+    "id": "2ab2c1b2.c4462e",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4256.566421508789,
-    "y": 6433.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4198.566421508789,
+    "y": 6455.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5b9298a4.1ed118",
-        "7163c900.606df8"
+        "6310145f.4f2a84",
+        "deaf1bfa.406858"
       ]
     ]
   },
   {
-    "id": "5b9298a4.1ed118",
+    "id": "6310145f.4f2a84",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4449.566421508789,
-    "y": 6434.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4391.566421508789,
+    "y": 6456.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5b9bdf25.e9536"
+        "92986ec9.51c668"
       ]
     ]
   },
   {
-    "id": "5b9bdf25.e9536",
+    "id": "92986ec9.51c668",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4605.566421508789,
-    "y": 6431.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4547.566421508789,
+    "y": 6453.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7163c900.606df8",
+    "id": "deaf1bfa.406858",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4453.566421508789,
-    "y": 6478.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4395.566421508789,
+    "y": 6500.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1fa38b13.5c2175"
+        "a4ec2716.41f19"
       ]
     ]
   },
   {
-    "id": "1fa38b13.5c2175",
+    "id": "a4ec2716.41f19",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4592.566421508789,
-    "y": 6473.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4534.566421508789,
+    "y": 6495.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cea8b041.47c29",
-        "ab589b66.44dca",
-        "bec4134.89e1d7",
-        "93569c40.48d5d8",
-        "21f4d700.883112",
-        "10882f4c.ff2cd1",
-        "2d523fb9.b5b8c8",
-        "54f95ba1.fd5b14",
-        "b2a13863.b94908",
-        "8b96c2fb.4933a8",
-        "ac6c48.3b961bb8",
-        "f3a1ad9d.6eb4a8",
-        "f140933b.8acec"
+        "9fd3ad0c.c5f0a",
+        "4aae1198.db26d8",
+        "b8ff0583.7b229",
+        "35f40d66.777f92",
+        "4c2ed97e.80e7a8",
+        "1d9d64e4.a08beb",
+        "fb131710.b3fbe",
+        "fa9aa1ff.8bf6e",
+        "c8446998.29dfe",
+        "a215a7d6.657bc8",
+        "977f17a0.9f41a",
+        "5d58f01d.864e08",
+        "ecfaffd6.100b2"
       ]
     ]
   },
   {
-    "id": "2d523fb9.b5b8c8",
+    "id": "fb131710.b3fbe",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4789.566421508789,
-    "y": 7152.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4731.566421508789,
+    "y": 7174.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "85a32ae2.fd7ca",
-        "2bd9412f.d2a736",
-        "14d3449f.8afb4b"
+        "cd8a8557.f7b3c8",
+        "49f465a0.b6d20c",
+        "5fdb4c32.46cfb4"
       ]
     ]
   },
   {
-    "id": "85a32ae2.fd7ca",
+    "id": "cd8a8557.f7b3c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4984.566635131836,
-    "y": 7128.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4926.566635131836,
+    "y": 7150.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "802d4aff.ed19c"
+        "7e4f80d.5c6488"
       ]
     ]
   },
   {
-    "id": "2bd9412f.d2a736",
+    "id": "49f465a0.b6d20c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4977.057601928711,
-    "y": 7164.859756469727,
-    "z": "3edf77d7.add3c",
+    "x": 4919.057601928711,
+    "y": 7186.659698486328,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1d4f1ec2.11c199"
+        "80117652.9958b8"
       ]
     ]
   },
   {
-    "id": "14d3449f.8afb4b",
+    "id": "5fdb4c32.46cfb4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4974.566635131836,
-    "y": 7208.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4916.566635131836,
+    "y": 7230.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1bbce323.6599c5"
+        "7193c18c.ae073"
       ]
     ]
   },
   {
-    "id": "802d4aff.ed19c",
+    "id": "7e4f80d.5c6488",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5156.566635131836,
-    "y": 7126.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5098.566635131836,
+    "y": 7148.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "dd0eed5a.ced22"
+        "d9a6ee9f.5c31f8"
       ]
     ]
   },
   {
-    "id": "1d4f1ec2.11c199",
+    "id": "80117652.9958b8",
     "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": 5139.629013061523,
-    "y": 7165.145492553711,
-    "z": "3edf77d7.add3c",
+    "x": 5081.629013061523,
+    "y": 7186.9454345703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1bbce323.6599c5",
+    "id": "7193c18c.ae073",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5141.566635131836,
-    "y": 7207.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5083.566635131836,
+    "y": 7229.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dd0eed5a.ced22",
+    "id": "d9a6ee9f.5c31f8",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5397.566421508789,
-    "y": 7160.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5339.566421508789,
+    "y": 7182.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "315a5202.03b08e"
+        "9aea7b31.b501a8"
       ]
     ]
   },
   {
-    "id": "315a5202.03b08e",
+    "id": "9aea7b31.b501a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5634.566421508789,
-    "y": 7156.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5576.566421508789,
+    "y": 7178.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ffe78e55.58a2"
+        "686e53e3.1ad1dc"
       ]
     ]
   },
   {
-    "id": "406bc3a2.6f4c5c",
+    "id": "2df6b745.3fe8d",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5901.566421508789,
-    "y": 7122.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5843.566421508789,
+    "y": 7144.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "efd6821.7606e8",
-        "dc64cef5.f4e71"
+        "3835a5ae.8b815a",
+        "a4db2f80.721418"
       ]
     ]
   },
   {
-    "id": "efd6821.7606e8",
+    "id": "3835a5ae.8b815a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6082.566421508789,
-    "y": 7148.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 6024.566421508789,
+    "y": 7170.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ffe78e55.58a2"
+        "686e53e3.1ad1dc"
       ]
     ]
   },
   {
-    "id": "dc64cef5.f4e71",
+    "id": "a4db2f80.721418",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6081.566421508789,
-    "y": 7101.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 6023.566421508789,
+    "y": 7123.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ffe78e55.58a2",
+    "id": "686e53e3.1ad1dc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4598.566635131836,
-    "y": 7296.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4540.566635131836,
+    "y": 7318.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b29b6e84.3ec808"
+        "a6487ee6.2cb7c"
       ]
     ]
   },
   {
-    "id": "aa51daf8.235328",
+    "id": "380ab70.5227a4a",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 5674.566421508789,
-    "y": 7328.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5616.566421508789,
+    "y": 7350.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3e921b26.a61a44",
+    "id": "a81b3e84.443f78",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4887.566635131836,
-    "y": 7064.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4829.566635131836,
+    "y": 7086.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "10882f4c.ff2cd1",
+    "id": "1d9d64e4.a08beb",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4771.566421508789,
-    "y": 6948.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4713.566421508789,
+    "y": 6970.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "649ceff4.e9cc5",
+    "id": "b1c30fd3.1d3b28",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5116.566421508789,
-    "y": 6779.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5058.566421508789,
+    "y": 6801.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b90f13f5.a31078"
+        "886001f.2b8eb8"
       ]
     ]
   },
   {
-    "id": "b90f13f5.a31078",
+    "id": "886001f.2b8eb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5336.566421508789,
-    "y": 6785.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5278.566421508789,
+    "y": 6807.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4aedc9d4.9239e8"
+        "7a4c6acb.556084"
       ]
     ]
   },
   {
-    "id": "4aedc9d4.9239e8",
+    "id": "7a4c6acb.556084",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5521.566421508789,
-    "y": 6784.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5463.566421508789,
+    "y": 6806.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8b4beaf0.bd49c8"
+        "801921d3.c16518"
       ]
     ]
   },
   {
-    "id": "8b4beaf0.bd49c8",
+    "id": "801921d3.c16518",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5713.566421508789,
-    "y": 6787.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5655.566421508789,
+    "y": 6809.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "67fe9740.178f68"
+        "a260b342.bdfc38"
       ]
     ]
   },
   {
-    "id": "67fe9740.178f68",
+    "id": "a260b342.bdfc38",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5922.566421508789,
-    "y": 6785.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5864.566421508789,
+    "y": 6807.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "54f95ba1.fd5b14",
+    "id": "fa9aa1ff.8bf6e",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4823.566421508789,
-    "y": 6773.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4765.566421508789,
+    "y": 6795.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "649ceff4.e9cc5"
+        "b1c30fd3.1d3b28"
       ]
     ]
   },
   {
-    "id": "bec4134.89e1d7",
+    "id": "b8ff0583.7b229",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4831.566421508789,
-    "y": 6666.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4773.566421508789,
+    "y": 6688.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "88715119.2c7c68",
-        "d632295f.b3442",
-        "973f1048.6edbb"
+        "be4d0129.981f9",
+        "ca7acc4e.a2f178",
+        "e6834a18.c1bb18"
       ]
     ]
   },
   {
-    "id": "88715119.2c7c68",
+    "id": "be4d0129.981f9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5067.566421508789,
-    "y": 6649.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5009.566421508789,
+    "y": 6671.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d632295f.b3442",
+    "id": "ca7acc4e.a2f178",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5064.566421508789,
-    "y": 6690.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5006.566421508789,
+    "y": 6712.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "973f1048.6edbb",
+    "id": "e6834a18.c1bb18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5078.566421508789,
-    "y": 6730.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5020.566421508789,
+    "y": 6752.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "93569c40.48d5d8",
+    "id": "35f40d66.777f92",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4767.566421508789,
-    "y": 6825.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4709.566421508789,
+    "y": 6847.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "21f4d700.883112",
+    "id": "4c2ed97e.80e7a8",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4775.566421508789,
-    "y": 6883.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4717.566421508789,
+    "y": 6905.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ab589b66.44dca",
+    "id": "4aae1198.db26d8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4780.566421508789,
-    "y": 6623.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4722.566421508789,
+    "y": 6645.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9ae90ae.274be78",
+    "id": "3d77fed3.ca6eba",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4895.566421508789,
-    "y": 6575.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4837.566421508789,
+    "y": 6597.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b29b6e84.3ec808",
+    "id": "a6487ee6.2cb7c",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4888.566635131836,
-    "y": 7291.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4830.566635131836,
+    "y": 7313.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ce3c2be3.503e38",
-        "f854c5fa.9550e8"
+        "ae63bb37.54dac",
+        "b4511f5d.149aa8"
       ]
     ]
   },
   {
-    "id": "ce3c2be3.503e38",
+    "id": "ae63bb37.54dac",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5144.566635131836,
-    "y": 7263.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5086.566635131836,
+    "y": 7285.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "eb8749e3.22de7"
+        "81398bf4.473028"
       ]
     ]
   },
   {
-    "id": "f854c5fa.9550e8",
+    "id": "b4511f5d.149aa8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5144.566635131836,
-    "y": 7312.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5086.566635131836,
+    "y": 7334.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "268cfed4.3ed072",
+    "id": "7de65a32.2588c4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5410.566635131836,
-    "y": 7304.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5352.566635131836,
+    "y": 7326.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "acce766e.9c38a",
-        "aa51daf8.235328",
-        "f459d871.345a18"
+        "f817cc8b.d031a",
+        "380ab70.5227a4a",
+        "c6c09e71.9092c"
       ]
     ]
   },
   {
-    "id": "2f1cf9f0.50adbe",
+    "id": "1d61af20.5c7829",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 5802.566421508789,
-    "y": 7382.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5744.566421508789,
+    "y": 7404.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f459d871.345a18",
+    "id": "c6c09e71.9092c",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5772.566421508789,
-    "y": 7442.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5714.566421508789,
+    "y": 7464.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "acce766e.9c38a",
+    "id": "f817cc8b.d031a",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5679.566421508789,
-    "y": 7270.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5621.566421508789,
+    "y": 7292.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e1ebd454.f4cdb8",
+    "id": "eab327e7.a5f748",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4029.566665649414,
-    "y": 5908.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3971.566665649414,
+    "y": 5930.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a5e6b4f4.57a38",
-        "2b3dd3ef.75d514",
-        "44cea2e2.e10b04",
-        "32da350f.e91202",
-        "d34f3733.82b438"
+        "afc7e373.9dd788",
+        "3d0b458a.f9a2a2",
+        "a3e7b437.8026b",
+        "2ab2c1b2.c4462e",
+        "47c00ee.a0fdbf"
       ]
     ]
   },
   {
-    "id": "6a9fab50.2b8dbc",
+    "id": "b8d2a9f2.b00c88",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4772.566421508789,
-    "y": 6723.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4714.566421508789,
+    "y": 6745.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b2a13863.b94908",
+    "id": "c8446998.29dfe",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4895.566665649414,
-    "y": 6453.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4837.566665649414,
+    "y": 6475.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "eedbe7ee.2e17",
+    "id": "13d35835.cdbb2",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 5032.566665649414,
-    "y": 6403.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4974.566665649414,
+    "y": 6425.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6d3e15fd.90249c",
+    "id": "997f20e4.966598",
     "type": "save",
     "name": "save ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6494.566665649414,
-    "y": 1937.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6436.566665649414,
+    "y": 1959.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "74dbf9c4.a2cac",
+    "id": "5c8518bd.0a436",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3760.566665649414,
-    "y": 1331.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3702.566665649414,
+    "y": 1353.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "691659c.355b428",
+    "id": "53a463ea.1b0834",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3898.566665649414,
-    "y": 1819.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3840.566665649414,
+    "y": 1841.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b49b44ed.34c0f",
+    "id": "53592f4d.08ea8",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6455.566665649414,
-    "y": 2649.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6397.566665649414,
+    "y": 2671.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "78110e1d.34a828",
+    "id": "f18404c6.f7135",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3747.566665649414,
-    "y": 4925.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3689.566665649414,
+    "y": 4947.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "399c8052.14794",
+    "id": "e65dde18.8f2e28",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3880.566665649414,
-    "y": 4973.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3822.566665649414,
+    "y": 4995.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "146ee230.44ecc6",
+    "id": "d070f297.71c91",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4425.566421508789,
-    "y": 5053.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4367.566421508789,
+    "y": 5075.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "939f1799.36d378",
-        "a646c5c3.cf3a8"
+        "dbaff1f0.67394",
+        "46c5a5e9.bca6a4"
       ]
     ]
   },
   {
-    "id": "939f1799.36d378",
+    "id": "dbaff1f0.67394",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4618.566421508789,
-    "y": 5054.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4560.566421508789,
+    "y": 5076.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bace55c5.99f12"
+        "df79a6f0.9fe378"
       ]
     ]
   },
   {
-    "id": "a646c5c3.cf3a8",
+    "id": "46c5a5e9.bca6a4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4622.566421508789,
-    "y": 5098.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4564.566421508789,
+    "y": 5120.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4039180c.15981"
+        "6414d7e3.ee4fd8"
       ]
     ]
   },
   {
-    "id": "4039180c.15981",
+    "id": "6414d7e3.ee4fd8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4761.566421508789,
-    "y": 5093.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4703.566421508789,
+    "y": 5115.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7ef13e15.cc2028",
-        "de57bd6c.da094",
-        "2e1e6c02.39beec"
+        "49c135f9.c35534",
+        "bf0f6300.a67238",
+        "fa0dda8.0253328"
       ]
     ]
   },
   {
-    "id": "bace55c5.99f12",
+    "id": "df79a6f0.9fe378",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4761.566421508789,
-    "y": 5050.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4703.566421508789,
+    "y": 5072.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "273e73f0.d7fa54",
-        "78d97bc5.d96984",
-        "464f510d.72c448",
-        "3e678579.1103ca"
+        "d6b231ff.4e48",
+        "e479d260.5097c",
+        "c8a578a.1c83e08",
+        "b408049f.7933a"
       ]
     ]
   },
   {
-    "id": "7ef13e15.cc2028",
+    "id": "49c135f9.c35534",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5155.566421508789,
-    "y": 5344.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5097.566421508789,
+    "y": 5366.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e4f0f550.01eee8",
+    "id": "f2d57861.b7d18",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5162.566421508789,
-    "y": 5298.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5104.566421508789,
+    "y": 5320.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8b96c2fb.4933a8",
+    "id": "a215a7d6.657bc8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4952.566635131836,
-    "y": 7013.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4894.566635131836,
+    "y": 7035.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "de57bd6c.da094",
+    "id": "bf0f6300.a67238",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5274.566421508789,
-    "y": 5397.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5216.566421508789,
+    "y": 5419.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5527664.91c39",
+    "id": "b27ea187.400a38",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5156.566421508789,
-    "y": 5615.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5098.566421508789,
+    "y": 5637.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9e36b46b.83aaa",
+    "id": "737e14df.0bf7ac",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3702.566665649414,
-    "y": 4374.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3644.566665649414,
+    "y": 4396.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dba3b4ab.601e58",
+    "id": "fe6ea6fb.83ee2",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4036.566665649414,
-    "y": 4557.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3978.566665649414,
+    "y": 4579.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "7855b68f.e847e",
+    "id": "1e648504.a919f3",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3648.566665649414,
-    "y": 4424.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3590.566665649414,
+    "y": 4446.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "27b19c0a.0b96bc",
-        "3755d72e.8ad5d8",
-        "e7a32b57.4d11"
+        "dc9ef631.89f33",
+        "9e45960a.d8b928",
+        "febbc6eb.2448e"
       ]
     ]
   },
   {
-    "id": "3755d72e.8ad5d8",
+    "id": "9e45960a.d8b928",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3876.057632446289,
-    "y": 4396.859725952148,
-    "z": "3edf77d7.add3c",
+    "x": 3818.057632446289,
+    "y": 4418.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8db24f9.ca62db"
+        "5d25632c.1d5374"
       ]
     ]
   },
   {
-    "id": "e7a32b57.4d11",
+    "id": "febbc6eb.2448e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3871.566665649414,
-    "y": 4441.285690307617,
-    "z": "3edf77d7.add3c",
+    "x": 3813.566665649414,
+    "y": 4463.085632324219,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c7878375.542c6"
+        "e99a952e.00d7c"
       ]
     ]
   },
   {
-    "id": "8db24f9.ca62db",
+    "id": "5d25632c.1d5374",
     "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": 4038.629165649414,
-    "y": 4396.145431518555,
-    "z": "3edf77d7.add3c",
+    "x": 3980.629165649414,
+    "y": 4417.945373535156,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c7878375.542c6",
+    "id": "e99a952e.00d7c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4039.566665649414,
-    "y": 4441.285690307617,
-    "z": "3edf77d7.add3c",
+    "x": 3981.566665649414,
+    "y": 4463.085632324219,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "32e0d279.a6eca6",
+    "id": "1d77f10f.5baf67",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3824.566665649414,
-    "y": 4514.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3766.566665649414,
+    "y": 4536.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a8a8e968.d6c638",
-        "dba3b4ab.601e58"
+        "35c9f98a.610e5e",
+        "fe6ea6fb.83ee2"
       ]
     ]
   },
   {
-    "id": "27b19c0a.0b96bc",
+    "id": "dc9ef631.89f33",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3655.566665649414,
-    "y": 4514.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3597.566665649414,
+    "y": 4536.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "32e0d279.a6eca6"
+        "1d77f10f.5baf67"
       ]
     ]
   },
   {
-    "id": "a8a8e968.d6c638",
+    "id": "35c9f98a.610e5e",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4013.566665649414,
-    "y": 4506.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3955.566665649414,
+    "y": 4528.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7a90992b.99ef7",
+    "id": "518cc181.03ac48",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3855.566665649414,
-    "y": 4801.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3797.566665649414,
+    "y": 4823.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "258c7b31.2a3584",
+    "id": "5a5e18e8.ffce08",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3638.566665649414,
-    "y": 2884.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3580.566665649414,
+    "y": 2906.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5517fa40.8d63c4",
+    "id": "47f11a92.b8ee4c",
     "type": "comment",
     "name": "We are doing modify and middle man exists, check if LEAF UNI already exists in AAI or not. If yes, consider the possible bw change. If it does not, then it is a new link needs to be added",
     "info": "",
     "comments": "",
-    "x": 2843.566665649414,
-    "y": 4446.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 2785.566665649414,
+    "y": 4468.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "872d6ff1.04a5b8",
+    "id": "a9808de.46ae97",
     "type": "exists",
     "name": "exists LEAF UNI",
     "xml": "<exists plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3266.566665649414,
-    "y": 4719.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3208.566665649414,
+    "y": 4741.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "99cdf1e3.76daa8",
-        "8ce192f6.43321"
+        "8236161f.361ec",
+        "f42c8ef.5dab47"
       ]
     ]
   },
   {
-    "id": "f3de805.eee03",
+    "id": "89fb91c7.4bd6f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3098.566665649414,
-    "y": 4722.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3040.566665649414,
+    "y": 4744.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "872d6ff1.04a5b8"
+        "a9808de.46ae97"
       ]
     ]
   },
   {
-    "id": "8ce192f6.43321",
+    "id": "f42c8ef.5dab47",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3429.566665649414,
-    "y": 4738.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3371.566665649414,
+    "y": 4760.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e429a394.1622b"
+        "10e6ecec.11b933"
       ]
     ]
   },
   {
-    "id": "99cdf1e3.76daa8",
+    "id": "8236161f.361ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3465.566665649414,
-    "y": 3345.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3407.566665649414,
+    "y": 3367.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "45ad7f75.acf2c"
+        "ac1b2d90.391b98"
       ]
     ]
   },
   {
-    "id": "894a7fb9.0e7198",
+    "id": "f9e3f20c.6b5eb8",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3814.566665649414,
-    "y": 3187.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3756.566665649414,
+    "y": 3209.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fc9baa20.3cffe",
-        "9e39c7e6.dd8a38"
+        "872bd81a.d26528",
+        "9b2249c8.bc9018"
       ]
     ]
   },
   {
-    "id": "fc9baa20.3cffe",
+    "id": "872bd81a.d26528",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4019.566665649414,
-    "y": 3183.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3961.566665649414,
+    "y": 3205.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9e39c7e6.dd8a38",
+    "id": "9b2249c8.bc9018",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4021.566665649414,
-    "y": 3233.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3963.566665649414,
+    "y": 3255.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d198772b.5f2b"
+        "dff51b02.8733d8"
       ]
     ]
   },
   {
-    "id": "d198772b.5f2b",
+    "id": "dff51b02.8733d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4177.566665649414,
-    "y": 3239.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4119.566665649414,
+    "y": 3261.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "23f5cc1d.41fbe4",
-        "fed6a907.2b3e28",
-        "fdf1da6c.032aa",
-        "51c677f3.cc82f"
+        "5f4129be.00541",
+        "7f1b37a2.172688",
+        "71ab4f0e.2a007",
+        "8aeeffc.718ae8"
       ]
     ]
   },
   {
-    "id": "23f5cc1d.41fbe4",
+    "id": "5f4129be.00541",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4403.566909790039,
-    "y": 2980.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4345.566909790039,
+    "y": 3002.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "84e42d5e.8f28b8",
+    "id": "d8ea64.968cf5a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4902.566390991211,
-    "y": 4277.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4844.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7591914.05111f",
-        "4f3fe980.0cfee8"
+        "140b25e4.abc76a",
+        "c4a242e7.6ad35"
       ]
     ]
   },
   {
-    "id": "4f3fe980.0cfee8",
+    "id": "c4a242e7.6ad35",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5104.566146850586,
-    "y": 4244.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5046.566146850586,
+    "y": 4266.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7cabc91f.298798",
+    "id": "f3c554f9.aa8de8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4788.566635131836,
-    "y": 4454.28547668457,
-    "z": "3edf77d7.add3c",
+    "x": 4730.566635131836,
+    "y": 4476.085418701172,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6e8a6a19.d50624",
+    "id": "a2deddc2.51b4b8",
     "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": 4785.628768920898,
-    "y": 4403.145492553711,
-    "z": "3edf77d7.add3c",
+    "x": 4727.628768920898,
+    "y": 4424.9454345703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "83166069.2f46b",
+    "id": "2a1af9c0.1651de",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4368.566390991211,
-    "y": 4277.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4310.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b23ac34.b9f8bc"
+        "6645febe.81a0d"
       ]
     ]
   },
   {
-    "id": "b23ac34.b9f8bc",
+    "id": "6645febe.81a0d",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573.566390991211,
-    "y": 4277.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4515.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "37a61cf7.b75674"
+        "1ad63798.bccb8"
       ]
     ]
   },
   {
-    "id": "37a61cf7.b75674",
+    "id": "1ad63798.bccb8",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4739.566390991211,
-    "y": 4277.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4681.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "84e42d5e.8f28b8"
+        "d8ea64.968cf5a"
       ]
     ]
   },
   {
-    "id": "7591914.05111f",
+    "id": "140b25e4.abc76a",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4411.566390991211,
-    "y": 4355.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4353.566390991211,
+    "y": 4377.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4b066055.dca1d",
-        "4c3bb63f.abb268",
-        "afaed0ec.37401"
+        "d5aa2b23.abf14",
+        "b25d8065.0eeb5",
+        "2e5be567.2683ca"
       ]
     ]
   },
   {
-    "id": "4b066055.dca1d",
+    "id": "d5aa2b23.abf14",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4622.566390991211,
-    "y": 4357.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4564.566390991211,
+    "y": 4379.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7a2986e1.36d518"
+        "dbaf0410.536798"
       ]
     ]
   },
   {
-    "id": "4c3bb63f.abb268",
+    "id": "b25d8065.0eeb5",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4623.057357788086,
-    "y": 4402.859756469727,
-    "z": "3edf77d7.add3c",
+    "x": 4565.057357788086,
+    "y": 4424.659698486328,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6e8a6a19.d50624"
+        "a2deddc2.51b4b8"
       ]
     ]
   },
   {
-    "id": "afaed0ec.37401",
+    "id": "2e5be567.2683ca",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.566390991211,
-    "y": 4446.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4562.566390991211,
+    "y": 4468.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7cabc91f.298798"
+        "f3c554f9.aa8de8"
       ]
     ]
   },
   {
-    "id": "45ad7f75.acf2c",
+    "id": "ac1b2d90.391b98",
     "type": "save",
     "name": "get LEAF uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3688.566665649414,
-    "y": 3030.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3630.566665649414,
+    "y": 3052.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "77412c28.93cabc",
-        "a9cae5b1.bd79",
-        "fb412e94.ff6ef8"
+        "518020a8.e5908",
+        "2f37bf62.6d766",
+        "1d68f74a.0ce429"
       ]
     ]
   },
   {
-    "id": "a9cae5b1.bd79",
+    "id": "2f37bf62.6d766",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.057632446289,
-    "y": 3002.8597259521484,
-    "z": "3edf77d7.add3c",
+    "x": 3858.057632446289,
+    "y": 3024.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a9cc314f.91999"
+        "a23311e6.197e98"
       ]
     ]
   },
   {
-    "id": "fb412e94.ff6ef8",
+    "id": "1d68f74a.0ce429",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3911.566665649414,
-    "y": 3047.285690307617,
-    "z": "3edf77d7.add3c",
+    "x": 3853.566665649414,
+    "y": 3069.0856323242188,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7c451252.08c29c"
+        "1f7edc05.06419c"
       ]
     ]
   },
   {
-    "id": "a9cc314f.91999",
+    "id": "a23311e6.197e98",
     "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": 4078.629165649414,
-    "y": 3002.1454315185547,
-    "z": "3edf77d7.add3c",
+    "x": 4020.629165649414,
+    "y": 3023.9453735351562,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7c451252.08c29c",
+    "id": "1f7edc05.06419c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4079.566665649414,
-    "y": 3047.285690307617,
-    "z": "3edf77d7.add3c",
+    "x": 4021.566665649414,
+    "y": 3069.0856323242188,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "77412c28.93cabc",
+    "id": "518020a8.e5908",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3923.566665649414,
-    "y": 3097.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3865.566665649414,
+    "y": 3119.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "894a7fb9.0e7198"
+        "f9e3f20c.6b5eb8"
       ]
     ]
   },
   {
-    "id": "22440324.4f2fcc",
+    "id": "3597d7fb.9d9fd",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3813.449996948242,
-    "y": 3288.1690826416016,
-    "z": "3edf77d7.add3c",
+    "x": 3755.449996948242,
+    "y": 3309.969024658203,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e0dae0e2.18c628",
+    "id": "8b55165.21410e8",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3795.166763305664,
-    "y": 3849.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 3737.166763305664,
+    "y": 3871.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6f17d5e2.9b03b4",
+    "id": "d35d1b04.286b5",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3933.166763305664,
-    "y": 3907.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 3875.166763305664,
+    "y": 3929.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "fed6a907.2b3e28",
+    "id": "7f1b37a2.172688",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3511.166763305664,
-    "y": 3589.3690032958984,
-    "z": "3edf77d7.add3c",
+    "x": 3453.166763305664,
+    "y": 3611.1689453125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "db019ae8.f69e68",
-        "cb5f4cbc.1262b8",
-        "ca40fb3f.0ddd08"
+        "2d37a713.1c4278",
+        "c7b27212.2f5b88",
+        "aaa5f9ec.d9ed6"
       ]
     ]
   },
   {
-    "id": "a1e56d0c.c484e8",
+    "id": "26c98beb.9e8714",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3752.166763305664,
-    "y": 4017.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 3694.166763305664,
+    "y": 4039.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "25e879f6.3e709e",
-        "8478688.57aab18"
+        "757df358.1ab404",
+        "46ca33dc.1a72ec"
       ]
     ]
   },
   {
-    "id": "25e879f6.3e709e",
+    "id": "757df358.1ab404",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3945.166763305664,
-    "y": 4018.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 3887.166763305664,
+    "y": 4040.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2c016cde.6263ac"
+        "43e4ef70.2c83f"
       ]
     ]
   },
   {
-    "id": "8478688.57aab18",
+    "id": "46ca33dc.1a72ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3949.166763305664,
-    "y": 4062.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 3891.166763305664,
+    "y": 4084.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f613ca73.1c6bb8"
+        "7ecc7e99.a8f718"
       ]
     ]
   },
   {
-    "id": "f613ca73.1c6bb8",
+    "id": "7ecc7e99.a8f718",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4088.166763305664,
-    "y": 4057.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 4030.166763305664,
+    "y": 4079.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "83166069.2f46b"
+        "2a1af9c0.1651de"
       ]
     ]
   },
   {
-    "id": "2c016cde.6263ac",
+    "id": "43e4ef70.2c83f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
     "comments": "",
-    "x": 4089.166763305664,
-    "y": 4014.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4031.166763305664,
+    "y": 4036.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fdf1da6c.032aa",
+    "id": "71ab4f0e.2a007",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4437.283706665039,
-    "y": 3236.5691986083984,
-    "z": "3edf77d7.add3c",
+    "x": 4379.283706665039,
+    "y": 3258.369140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "624fa50f.6c863c",
-        "2cbb1141.892c6e"
+        "e5e20266.b6ad18",
+        "fa7ec0d3.484e4"
       ]
     ]
   },
   {
-    "id": "624fa50f.6c863c",
+    "id": "e5e20266.b6ad18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4636.450698852539,
-    "y": 3303.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4578.450698852539,
+    "y": 3324.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "dec3e17a.4aeb5"
+        "c400bc3c.ac5968"
       ]
     ]
   },
   {
-    "id": "2cbb1141.892c6e",
+    "id": "fa7ec0d3.484e4",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4658.450698852539,
-    "y": 3148.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4600.450698852539,
+    "y": 3169.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "591bc18f.862f3"
+        "f79a9470.53a4c8"
       ]
     ]
   },
   {
-    "id": "51c677f3.cc82f",
+    "id": "8aeeffc.718ae8",
     "type": "save",
     "name": "update LEAF UNI in AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "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='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4436.283706665039,
-    "y": 3091.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 4378.283706665039,
+    "y": 3113.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "84a6fa88.639cd8",
+    "id": "b6c5ddb8.eb856",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4452.450698852539,
-    "y": 3045.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4394.450698852539,
+    "y": 3066.968994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "281d0553.9e5102",
+    "id": "ab07d3e7.b0f788",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5007.216567993164,
-    "y": 2500.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4949.216567993164,
+    "y": 2521.968994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e4f725a7.1779b8",
+    "id": "6a6aa672.a79588",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5609.216567993164,
-    "y": 2605.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5551.216567993164,
+    "y": 2626.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e1b1c4e.72c2bc",
+    "id": "cbbe95bb.3b672",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4999.216323852539,
-    "y": 2546.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4941.216323852539,
+    "y": 2567.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d8429e74.2e1a2",
-        "e4667648.c01938",
-        "4ea5d18f.5a2f38"
+        "29f0d39b.7868dc",
+        "a9cdc9f3.565c48",
+        "bb4a2538.1336f8"
       ]
     ]
   },
   {
-    "id": "e4667648.c01938",
+    "id": "a9cdc9f3.565c48",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5226.707290649414,
-    "y": 2518.7430267333984,
-    "z": "3edf77d7.add3c",
+    "x": 5168.707290649414,
+    "y": 2540.54296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1f89164b.95601a"
+        "1908939b.bd4034"
       ]
     ]
   },
   {
-    "id": "4ea5d18f.5a2f38",
+    "id": "bb4a2538.1336f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5222.216323852539,
-    "y": 2563.168991088867,
-    "z": "3edf77d7.add3c",
+    "x": 5164.216323852539,
+    "y": 2584.9689331054688,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "88705cd9.03d55"
+        "92667393.c53a48"
       ]
     ]
   },
   {
-    "id": "1f89164b.95601a",
+    "id": "1908939b.bd4034",
     "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": 5389.278823852539,
-    "y": 2518.0287322998047,
-    "z": "3edf77d7.add3c",
+    "x": 5331.278823852539,
+    "y": 2539.8286743164062,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "88705cd9.03d55",
+    "id": "92667393.c53a48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5390.216323852539,
-    "y": 2563.168991088867,
-    "z": "3edf77d7.add3c",
+    "x": 5332.216323852539,
+    "y": 2584.9689331054688,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2e8d1bdd.85c644",
+    "id": "881aa049.c716c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5387.216323852539,
-    "y": 2613.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5329.216323852539,
+    "y": 2634.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f78dc911.45f94",
-        "e4f725a7.1779b8"
+        "462dc669.256da8",
+        "6a6aa672.a79588"
       ]
     ]
   },
   {
-    "id": "d8429e74.2e1a2",
+    "id": "29f0d39b.7868dc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5218.216323852539,
-    "y": 2613.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5160.216323852539,
+    "y": 2634.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2e8d1bdd.85c644"
+        "881aa049.c716c"
       ]
     ]
   },
   {
-    "id": "f78dc911.45f94",
+    "id": "462dc669.256da8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5569.217056274414,
-    "y": 2555.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5511.217056274414,
+    "y": 2576.968994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d33826b1.ef8f58",
+    "id": "cf90a66f.fda158",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4650.449996948242,
-    "y": 3110.1690826416016,
-    "z": "3edf77d7.add3c",
+    "x": 4592.449996948242,
+    "y": 3131.969024658203,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "84f3d20e.4f91a8",
+    "id": "55a0d7dc.286418",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4649.283706665039,
-    "y": 3266.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4591.283706665039,
+    "y": 3288.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "48adb9de.8dd8c8",
+    "id": "4d5920d6.13a668",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5098.282974243164,
-    "y": 2839.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5040.282974243164,
+    "y": 2861.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ccc0529e.d89b08",
+    "id": "88d6c65c.cf7f08",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5700.282974243164,
-    "y": 2944.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5642.282974243164,
+    "y": 2966.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "337b01b3.8933a6",
+    "id": "d0b2cf41.bca298",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5090.282730102539,
-    "y": 2885.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5032.282730102539,
+    "y": 2907.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "799a0808.a03288",
-        "b771a02d.8b4ba",
-        "6a9817e4.946118"
+        "8d492b8.9c23958",
+        "7af8c9ac.4fdff",
+        "8f5e4c1.c47c63"
       ]
     ]
   },
   {
-    "id": "b771a02d.8b4ba",
+    "id": "7af8c9ac.4fdff",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5317.773696899414,
-    "y": 2858.5430755615234,
-    "z": "3edf77d7.add3c",
+    "x": 5259.773696899414,
+    "y": 2880.343017578125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6b02c11a.d4f898"
+        "a556ac9c.f99378"
       ]
     ]
   },
   {
-    "id": "6a9817e4.946118",
+    "id": "8f5e4c1.c47c63",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5313.282730102539,
-    "y": 2902.969039916992,
-    "z": "3edf77d7.add3c",
+    "x": 5255.282730102539,
+    "y": 2924.7689819335938,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "130a98d8.a059e7"
+        "fb5f5c18.d85868"
       ]
     ]
   },
   {
-    "id": "6b02c11a.d4f898",
+    "id": "a556ac9c.f99378",
     "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": 5480.345230102539,
-    "y": 2857.8287811279297,
-    "z": "3edf77d7.add3c",
+    "x": 5422.345230102539,
+    "y": 2879.6287231445312,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "130a98d8.a059e7",
+    "id": "fb5f5c18.d85868",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5481.282730102539,
-    "y": 2902.969039916992,
-    "z": "3edf77d7.add3c",
+    "x": 5423.282730102539,
+    "y": 2924.7689819335938,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ff63a7c4.86cf08",
+    "id": "1055bce3.28f203",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5478.282730102539,
-    "y": 2952.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5420.282730102539,
+    "y": 2974.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "871b9cd5.ec522",
-        "ccc0529e.d89b08"
+        "67fafdaf.ff6be4",
+        "88d6c65c.cf7f08"
       ]
     ]
   },
   {
-    "id": "799a0808.a03288",
+    "id": "8d492b8.9c23958",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5309.282730102539,
-    "y": 2952.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5251.282730102539,
+    "y": 2974.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ff63a7c4.86cf08"
+        "1055bce3.28f203"
       ]
     ]
   },
   {
-    "id": "871b9cd5.ec522",
+    "id": "67fafdaf.ff6be4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5660.283462524414,
-    "y": 2894.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5602.283462524414,
+    "y": 2916.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dce7c6b5.af48e",
+    "id": "16d60a9.8d32af5",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$tmp.aai.leafuni.data-source - $gfp`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='false' />\n\n\n",
     "comments": "",
-    "x": 5015.282730102539,
-    "y": 2798.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4957.282730102539,
+    "y": 2820.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dec3e17a.4aeb5",
+    "id": "c400bc3c.ac5968",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4808.449996948242,
-    "y": 3292.1690826416016,
-    "z": "3edf77d7.add3c",
+    "x": 4750.449996948242,
+    "y": 3313.969024658203,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "dce7c6b5.af48e",
-        "337b01b3.8933a6",
-        "9c79a60.2e838d8"
+        "16d60a9.8d32af5",
+        "d0b2cf41.bca298",
+        "8414e4a1.38b9c8"
       ]
     ]
   },
   {
-    "id": "591bc18f.862f3",
+    "id": "f79a9470.53a4c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4829.183364868164,
-    "y": 3118.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4771.183364868164,
+    "y": 3140.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c0c09747.1b1be",
-        "1e1b1c4e.72c2bc",
-        "615783e8.7114bc"
+        "117ea4ef.18b79b",
+        "cbbe95bb.3b672",
+        "ba199ac4.fb848"
       ]
     ]
   },
   {
-    "id": "c0c09747.1b1be",
+    "id": "117ea4ef.18b79b",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='true' />\n",
     "comments": "",
-    "x": 4964.016128540039,
-    "y": 2424.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 4906.016128540039,
+    "y": 2446.569091796875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1fd4804f.571bd8",
+    "id": "c54ad09e.8bf3a",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4423.333267211914,
-    "y": 3191.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4365.333267211914,
+    "y": 3213.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "793c3d11.91f2fc",
+    "id": "2dd0c0ce.4b6dd8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3892.666732788086,
-    "y": 4180.769607543945,
-    "z": "3edf77d7.add3c",
+    "x": 3834.666732788086,
+    "y": 4202.569549560547,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "334968de.3ae5d",
+    "id": "f75e3970.5d2918",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3727.666732788086,
-    "y": 4252.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 3669.666732788086,
+    "y": 4274.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "420a91d4.f005f",
-        "9e2d332a.723078"
+        "6558c3a1.aee6ec",
+        "615d888.e8de878"
       ]
     ]
   },
   {
-    "id": "420a91d4.f005f",
+    "id": "6558c3a1.aee6ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3938.666732788086,
-    "y": 4252.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 3880.666732788086,
+    "y": 4274.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "692a8c7a.fda954"
+        "dbe2bb07.4ff"
       ]
     ]
   },
   {
-    "id": "9e2d332a.723078",
+    "id": "615d888.e8de878",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3934.666732788086,
-    "y": 4300.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 3876.666732788086,
+    "y": 4322.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6695c568.10d40c"
+        "981910a2.c0ad4"
       ]
     ]
   },
   {
-    "id": "692a8c7a.fda954",
+    "id": "dbe2bb07.4ff",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4094.666732788086,
-    "y": 4248.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 4036.666732788086,
+    "y": 4270.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1378eadb.299955"
+        "d5500d79.08788"
       ]
     ]
   },
   {
-    "id": "6695c568.10d40c",
+    "id": "981910a2.c0ad4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found but it should have been!' />\n",
     "comments": "",
-    "x": 4082.666732788086,
-    "y": 4295.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 4024.666732788086,
+    "y": 4317.769500732422,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "42d7c1e3.70d63",
+    "id": "3bc11366.fbbc34",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4935.632827758789,
-    "y": 4563.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4877.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "48aa49b9.b94898",
-        "9faa5f11.a8b628"
+        "dd06399c.007818",
+        "d4fdd67a.a817c8"
       ]
     ]
   },
   {
-    "id": "9faa5f11.a8b628",
+    "id": "d4fdd67a.a817c8",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5178.633071899414,
-    "y": 4532.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 5120.633071899414,
+    "y": 4553.96826171875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6b7d6b27.bf3f6c",
+    "id": "2be00ed8.b483fa",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4795.632827758789,
-    "y": 4673.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4737.632827758789,
+    "y": 4694.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8f38170c.15c52"
+        "97d72fe9.69bac8"
       ]
     ]
   },
   {
-    "id": "e53eb8db.b4de68",
+    "id": "91c8662a.32a768",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4783.633071899414,
-    "y": 4766.168563842773,
-    "z": "3edf77d7.add3c",
+    "x": 4725.633071899414,
+    "y": 4787.968505859375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8d6af4a3.13c21",
+    "id": "d203ac94.87b14",
     "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": 4785.695205688477,
-    "y": 4721.028091430664,
-    "z": "3edf77d7.add3c",
+    "x": 4727.695205688477,
+    "y": 4742.828033447266,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1378eadb.299955",
+    "id": "d5500d79.08788",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4401.632827758789,
-    "y": 4563.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4343.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b83aa531.8a6d18"
+        "c8667f42.17971"
       ]
     ]
   },
   {
-    "id": "b83aa531.8a6d18",
+    "id": "c8667f42.17971",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4606.632827758789,
-    "y": 4563.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4548.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a88f4eb0.5f047"
+        "459caa2c.0e6e04"
       ]
     ]
   },
   {
-    "id": "a88f4eb0.5f047",
+    "id": "459caa2c.0e6e04",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4772.632827758789,
-    "y": 4563.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4714.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "42d7c1e3.70d63"
+        "3bc11366.fbbc34"
       ]
     ]
   },
   {
-    "id": "48aa49b9.b94898",
+    "id": "dd06399c.007818",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4411.632827758789,
-    "y": 4673.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4353.632827758789,
+    "y": 4694.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7a79979c.8eea88",
-        "442b3988.19bc",
-        "5c729d6c.56aa94"
+        "bdef323e.2e743",
+        "8bfc1c1b.2feb4",
+        "6eeff3cb.d5d2dc"
       ]
     ]
   },
   {
-    "id": "7a79979c.8eea88",
+    "id": "bdef323e.2e743",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4622.632827758789,
-    "y": 4675.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4564.632827758789,
+    "y": 4696.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6b7d6b27.bf3f6c"
+        "2be00ed8.b483fa"
       ]
     ]
   },
   {
-    "id": "442b3988.19bc",
+    "id": "8bfc1c1b.2feb4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4623.123794555664,
-    "y": 4720.74235534668,
-    "z": "3edf77d7.add3c",
+    "x": 4565.123794555664,
+    "y": 4742.542297363281,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8d6af4a3.13c21"
+        "d203ac94.87b14"
       ]
     ]
   },
   {
-    "id": "5c729d6c.56aa94",
+    "id": "6eeff3cb.d5d2dc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.632827758789,
-    "y": 4764.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4562.632827758789,
+    "y": 4785.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e53eb8db.b4de68"
+        "91c8662a.32a768"
       ]
     ]
   },
   {
-    "id": "4e4fb9a1.270b08",
+    "id": "b4556ca5.203ec",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 6031.449722290039,
-    "y": 7062.369247436523,
-    "z": "3edf77d7.add3c",
+    "x": 5973.449722290039,
+    "y": 7084.169189453125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "16ba58e8.574907",
+    "id": "5b30bbfe.71d1cc",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5299.916732788086,
-    "y": 4293.568923950195,
-    "z": "3edf77d7.add3c",
+    "x": 5241.916732788086,
+    "y": 4315.368865966797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7a2986e1.36d518",
+    "id": "dbaf0410.536798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4801.916976928711,
-    "y": 4359.568923950195,
-    "z": "3edf77d7.add3c",
+    "x": 4743.916976928711,
+    "y": 4381.368865966797,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f1d3809d.7253c8",
+    "id": "817a92f2.d780d",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5332.916732788086,
-    "y": 4361.568923950195,
-    "z": "3edf77d7.add3c",
+    "x": 5274.916732788086,
+    "y": 4383.368865966797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2b6629f8.8ae99e",
-        "6b873c45.812654"
+        "9dfe7d9b.36f16",
+        "6633e166.0ef198"
       ]
     ]
   },
   {
-    "id": "2b6629f8.8ae99e",
+    "id": "9dfe7d9b.36f16",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5457.916732788086,
-    "y": 4259.56867980957,
-    "z": "3edf77d7.add3c",
+    "x": 5399.916732788086,
+    "y": 4281.368621826172,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "575e916.aaad5f"
+        "bef4e32d.a8f0f"
       ]
     ]
   },
   {
-    "id": "6b873c45.812654",
+    "id": "6633e166.0ef198",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5576.916763305664,
-    "y": 4333.568710327148,
-    "z": "3edf77d7.add3c",
+    "x": 5518.916763305664,
+    "y": 4355.36865234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1440683a.de744",
+    "id": "13e3cfc5.6c211",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4545.599868774414,
-    "y": 3905.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4487.599868774414,
+    "y": 3927.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c9d5b018.f8051",
+    "id": "c04b322f.90f188",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4890.599868774414,
-    "y": 3767.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4832.599868774414,
+    "y": 3789.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "74718a63.36de84"
+        "641a94ad.cf9a7c"
       ]
     ]
   },
   {
-    "id": "55284001.8f5b08",
+    "id": "cb16b3c1.554ca8",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4597.599868774414,
-    "y": 3761.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4539.599868774414,
+    "y": 3783.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c9d5b018.f8051"
+        "c04b322f.90f188"
       ]
     ]
   },
   {
-    "id": "75332f13.262108",
+    "id": "61a224f4.1490f4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4852.599868774414,
-    "y": 3718.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4794.599868774414,
+    "y": 3740.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1dffa908.5b5767",
+    "id": "79714250.d2dcd4",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4541.599868774414,
-    "y": 3813.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4483.599868774414,
+    "y": 3835.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2247e7bb.aa6698",
+    "id": "accca5a7.e8bcb",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4549.599868774414,
-    "y": 3858.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4491.599868774414,
+    "y": 3880.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "766a8bc6.9fb0cc",
+    "id": "4917ab18.c68984",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4546.599868774414,
-    "y": 3711.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4488.599868774414,
+    "y": 3733.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "74718a63.36de84",
+    "id": "641a94ad.cf9a7c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4799.599868774414,
-    "y": 3835.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4741.599868774414,
+    "y": 3857.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "238ee53c.904a6a"
+        "a41b4c9c.8533c8"
       ]
     ]
   },
   {
-    "id": "238ee53c.904a6a",
+    "id": "a41b4c9c.8533c8",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4984.599868774414,
-    "y": 3834.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4926.599868774414,
+    "y": 3856.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7de620b3.3d3198"
+        "16d0f836.5619d"
       ]
     ]
   },
   {
-    "id": "7de620b3.3d3198",
+    "id": "16d0f836.5619d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5176.599868774414,
-    "y": 3837.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5118.599868774414,
+    "y": 3859.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f9ce03fd.3df508"
+        "645ca090.154ad8"
       ]
     ]
   },
   {
-    "id": "f9ce03fd.3df508",
+    "id": "645ca090.154ad8",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5348.599868774414,
-    "y": 3833.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5290.599868774414,
+    "y": 3855.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d48247ca.056eb",
+    "id": "67efef93.94a62",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4724.599868774414,
-    "y": 3948.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4666.599868774414,
+    "y": 3970.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "db019ae8.f69e68",
+    "id": "2d37a713.1c4278",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4241.599868774414,
-    "y": 3733.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4183.599868774414,
+    "y": 3755.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d62659b6.160db8",
-        "cf64723d.dfeea8",
-        "1dffa908.5b5767",
-        "2247e7bb.aa6698",
-        "1440683a.de744",
-        "55284001.8f5b08",
-        "d48247ca.056eb"
+        "fc1ea1ac.e5e448",
+        "e72f0644.170c1",
+        "79714250.d2dcd4",
+        "accca5a7.e8bcb",
+        "13e3cfc5.6c211",
+        "cb16b3c1.554ca8",
+        "67efef93.94a62"
       ]
     ]
   },
   {
-    "id": "1fb81d61.c0c6c3",
+    "id": "9d25224b.2344f8",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4226.599868774414,
-    "y": 3667.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4168.599868774414,
+    "y": 3689.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cf64723d.dfeea8",
+    "id": "e72f0644.170c1",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4605.599868774414,
-    "y": 3654.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4547.599868774414,
+    "y": 3676.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "61f8c12d.7ec188",
-        "b0224d35.db0ba",
-        "75332f13.262108"
+        "e651547d.d99b88",
+        "9ee7d7c1.7baf1",
+        "61a224f4.1490f4"
       ]
     ]
   },
   {
-    "id": "61f8c12d.7ec188",
+    "id": "e651547d.d99b88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4841.599868774414,
-    "y": 3637.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4783.599868774414,
+    "y": 3659.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b0224d35.db0ba",
+    "id": "9ee7d7c1.7baf1",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4838.599868774414,
-    "y": 3678.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4780.599868774414,
+    "y": 3700.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d62659b6.160db8",
+    "id": "fc1ea1ac.e5e448",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4554.599868774414,
-    "y": 3611.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4496.599868774414,
+    "y": 3633.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cbd695e8.8ce3",
+    "id": "7b5e5ce4.837894",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5283.999771118164,
-    "y": 4660.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5225.999771118164,
+    "y": 4682.485595703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8f38170c.15c52",
+    "id": "97d72fe9.69bac8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5072.999771118164,
-    "y": 4722.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5014.999771118164,
+    "y": 4744.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "eec0ed64.666e3"
+        "9a139c6f.7e9338"
       ]
     ]
   },
   {
-    "id": "eec0ed64.666e3",
+    "id": "9a139c6f.7e9338",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5316.999771118164,
-    "y": 4728.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5258.999771118164,
+    "y": 4750.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "da15375d.9b0ee8",
-        "3ee187ea.cd5be8"
+        "f77309ba.c91088",
+        "14cb90c5.a4f8ff"
       ]
     ]
   },
   {
-    "id": "da15375d.9b0ee8",
+    "id": "f77309ba.c91088",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5547.999771118164,
-    "y": 4706.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5489.999771118164,
+    "y": 4728.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7e1ed8b0.7851f"
+        "d9be22a0.00a98"
       ]
     ]
   },
   {
-    "id": "3ee187ea.cd5be8",
+    "id": "14cb90c5.a4f8ff",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5552.999771118164,
-    "y": 4773.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5494.999771118164,
+    "y": 4795.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "33a4fd6a.f05cf2",
+    "id": "414056d.7db8ba8",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5801.883529663086,
-    "y": 4271.36799621582,
-    "z": "3edf77d7.add3c",
+    "x": 5743.883529663086,
+    "y": 4293.167938232422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e619571d.07b27",
-        "7e5b3b13.527164"
+        "7fdfcb8f.16a5bc",
+        "c3a97bf3.cec48"
       ]
     ]
   },
   {
-    "id": "e619571d.07b27",
+    "id": "7fdfcb8f.16a5bc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5956.883560180664,
-    "y": 4199.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 5898.883560180664,
+    "y": 4221.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a419c34.20a76c"
+        "b797878.bae0cf8"
       ]
     ]
   },
   {
-    "id": "7e5b3b13.527164",
+    "id": "c3a97bf3.cec48",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5957.883560180664,
-    "y": 4332.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 5899.883560180664,
+    "y": 4354.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8b03748e.6511"
+        "e250ecc5.35ab28"
       ]
     ]
   },
   {
-    "id": "a419c34.20a76c",
+    "id": "b797878.bae0cf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6101.883560180664,
-    "y": 4199.368515014648,
-    "z": "3edf77d7.add3c",
+    "x": 6043.883560180664,
+    "y": 4221.16845703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e331e060.96ce2",
-        "f02eaafa.80f4b"
+        "424fa95d.ed7fe",
+        "75e1d3fe.929f74"
       ]
     ]
   },
   {
-    "id": "e331e060.96ce2",
+    "id": "424fa95d.ed7fe",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6394.883560180664,
-    "y": 4177.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 6336.883560180664,
+    "y": 4199.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f02eaafa.80f4b",
+    "id": "75e1d3fe.929f74",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6346.533462524414,
-    "y": 4224.685165405273,
-    "z": "3edf77d7.add3c",
+    "x": 6288.533462524414,
+    "y": 4246.485107421875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "fac6e0eb.b7e5e8",
+    "id": "5dd8867f.439e3",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6419.883529663086,
-    "y": 4126.36799621582,
-    "z": "3edf77d7.add3c",
+    "x": 6361.883529663086,
+    "y": 4148.167938232422,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8b03748e.6511",
+    "id": "e250ecc5.35ab28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6113.883560180664,
-    "y": 4331.368515014648,
-    "z": "3edf77d7.add3c",
+    "x": 6055.883560180664,
+    "y": 4353.16845703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7cde89b.f9cde78",
-        "44d5eb8e.8b5a7c"
+        "417900a8.821de",
+        "be5a71f5.125bd8"
       ]
     ]
   },
   {
-    "id": "7cde89b.f9cde78",
+    "id": "417900a8.821de",
     "type": "save",
     "name": "update the-vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6406.883560180664,
-    "y": 4309.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 6348.883560180664,
+    "y": 4331.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "44d5eb8e.8b5a7c",
+    "id": "be5a71f5.125bd8",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6358.533462524414,
-    "y": 4356.685165405273,
-    "z": "3edf77d7.add3c",
+    "x": 6300.533462524414,
+    "y": 4378.485107421875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "8783d256.dfbee8",
+    "id": "a603f2dd.a46cd8",
     "type": "comment",
     "name": "decrease the bw of the-vpn-binding and change status to modified",
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6430.883560180664,
-    "y": 4270.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 6372.883560180664,
+    "y": 4292.168212890625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7e1ed8b0.7851f",
+    "id": "d9be22a0.00a98",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5753.116470336914,
-    "y": 4713.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5695.116470336914,
+    "y": 4735.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cf050a6d.dffd88",
-        "15aed249.cbc52e"
+        "c2b73899.5086",
+        "f61c39ed.e925c8"
       ]
     ]
   },
   {
-    "id": "cf050a6d.dffd88",
+    "id": "c2b73899.5086",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5948.116470336914,
-    "y": 4641.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5890.116470336914,
+    "y": 4663.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ed50abf.ff9d7c"
+        "d6c79c19.937aa"
       ]
     ]
   },
   {
-    "id": "15aed249.cbc52e",
+    "id": "f61c39ed.e925c8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5949.116470336914,
-    "y": 4774.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5891.116470336914,
+    "y": 4796.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2100e232.b11cce"
+        "4edaf13a.b4d9f"
       ]
     ]
   },
   {
-    "id": "5ed50abf.ff9d7c",
+    "id": "d6c79c19.937aa",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6093.116470336914,
-    "y": 4641.569198608398,
-    "z": "3edf77d7.add3c",
+    "x": 6035.116470336914,
+    "y": 4663.369140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e4e29811.e1048",
-        "e58be206.dcc488"
+        "d6b8ba93.8ff92",
+        "f1f742e0.7a641"
       ]
     ]
   },
   {
-    "id": "e4e29811.e1048",
+    "id": "d6b8ba93.8ff92",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6386.116470336914,
-    "y": 4619.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 6328.116470336914,
+    "y": 4641.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "e58be206.dcc488",
+    "id": "f1f742e0.7a641",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6337.766372680664,
-    "y": 4666.885848999023,
-    "z": "3edf77d7.add3c",
+    "x": 6279.766372680664,
+    "y": 4688.685791015625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "fa3f6ab4.8ef07",
+    "id": "d36450e6.6d57c8",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6410.116470336914,
-    "y": 4580.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 6352.116470336914,
+    "y": 4602.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2100e232.b11cce",
+    "id": "4edaf13a.b4d9f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6105.116470336914,
-    "y": 4773.569198608398,
-    "z": "3edf77d7.add3c",
+    "x": 6047.116470336914,
+    "y": 4795.369140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8a653803.fc1f6",
-        "4431f46f.b3008c"
+        "7a3b5a2.2e1f624",
+        "1ba425ad.b54daa"
       ]
     ]
   },
   {
-    "id": "8a653803.fc1f6",
+    "id": "7a3b5a2.2e1f624",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6398.116470336914,
-    "y": 4751.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 6340.116470336914,
+    "y": 4773.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4431f46f.b3008c",
+    "id": "1ba425ad.b54daa",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6349.766372680664,
-    "y": 4798.885848999023,
-    "z": "3edf77d7.add3c",
+    "x": 6291.766372680664,
+    "y": 4820.685791015625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "bbeeae4d.bca708",
+    "id": "22900b75.03f974",
     "type": "comment",
     "name": "decrease the bw of the-vpn-binding and change status to modified",
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6422.116470336914,
-    "y": 4712.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 6364.116470336914,
+    "y": 4734.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "aea70ead.9836b8",
+    "id": "ef554fdd.c7de28",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5160.966567993164,
-    "y": 5453.769149780273,
-    "z": "3edf77d7.add3c",
+    "x": 5102.966567993164,
+    "y": 5475.569091796875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2e1e6c02.39beec",
+    "id": "fa0dda8.0253328",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5158.749771118164,
-    "y": 5493.969345092773,
-    "z": "3edf77d7.add3c",
+    "x": 5100.749771118164,
+    "y": 5515.769287109375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a8fe1a2c.71b3c8",
+    "id": "f06e1df.64a1e6",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5034.000015258789,
-    "y": 5678.452255249023,
-    "z": "3edf77d7.add3c",
+    "x": 4976.000015258789,
+    "y": 5700.252197265625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7871c32f.9d91cc",
+    "id": "ca1c65a6.dca85",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5031.783218383789,
-    "y": 5718.652450561523,
-    "z": "3edf77d7.add3c",
+    "x": 4973.783218383789,
+    "y": 5740.452392578125,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "685061c3.01675",
+    "id": "a99f468d.7b18e",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5131.116470336914,
-    "y": 6002.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5073.116470336914,
+    "y": 6024.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "29335c50.b3bc5c",
+    "id": "8488a4f2.44d84",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4958.116470336914,
-    "y": 6059.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 4900.116470336914,
+    "y": 6081.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a0a30ce1.826348",
-        "8ce5c005.55e608"
+        "7fa62708.b47fb8",
+        "8128360f.d5f0f8"
       ]
     ]
   },
   {
-    "id": "a0a30ce1.826348",
+    "id": "7fa62708.b47fb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5169.116470336914,
-    "y": 6059.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5111.116470336914,
+    "y": 6081.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "590e11da.6a5d5"
+        "7522288d.71e8f8"
       ]
     ]
   },
   {
-    "id": "8ce5c005.55e608",
+    "id": "8128360f.d5f0f8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5165.116470336914,
-    "y": 6107.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5107.116470336914,
+    "y": 6129.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ceea008c.a129b"
+        "fb9502dd.0e71b"
       ]
     ]
   },
   {
-    "id": "590e11da.6a5d5",
+    "id": "7522288d.71e8f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5325.116470336914,
-    "y": 6055.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5267.116470336914,
+    "y": 6077.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "755f894f.dc414",
-        "2f6a3eee.3c813a",
-        "d68f19c9.00e6c"
+        "9f8e58e7.89aac",
+        "d14d9fb3.031c",
+        "ade8b0f8.453b68"
       ]
     ]
   },
   {
-    "id": "ceea008c.a129b",
+    "id": "fb9502dd.0e71b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5313.116470336914,
-    "y": 6102.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5255.116470336914,
+    "y": 6124.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "692d5d8e.91da94",
+    "id": "482690e8.af77d8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5591.000259399414,
-    "y": 6155.452255249023,
-    "z": "3edf77d7.add3c",
+    "x": 5533.000259399414,
+    "y": 6177.252197265625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d68f19c9.00e6c",
+    "id": "ade8b0f8.453b68",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5588.783462524414,
-    "y": 6195.652450561523,
-    "z": "3edf77d7.add3c",
+    "x": 5530.783462524414,
+    "y": 6217.452392578125,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f6a3eee.3c813a",
+    "id": "d14d9fb3.031c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5708.116470336914,
-    "y": 6107.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5650.116470336914,
+    "y": 6129.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "755f894f.dc414",
+    "id": "9f8e58e7.89aac",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5579.116470336914,
-    "y": 6055.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5521.116470336914,
+    "y": 6077.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e084ba5b.54a44",
+    "id": "b5ec42e6.8d4a38",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5020.116470336914,
-    "y": 5960.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 4962.116470336914,
+    "y": 5982.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ac6c48.3b961bb8",
+    "id": "977f17a0.9f41a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4667.449478149414,
-    "y": 6047.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 4609.449478149414,
+    "y": 6069.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "685061c3.01675",
-        "29335c50.b3bc5c",
-        "2fa7a2c0.97e2e6",
-        "ed4e275a.a600a"
+        "a99f468d.7b18e",
+        "8488a4f2.44d84",
+        "9cfb7864.e0e548",
+        "98761b9f.ff6118"
       ]
     ]
   },
   {
-    "id": "f3a1ad9d.6eb4a8",
+    "id": "5d58f01d.864e08",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5011.199966430664,
-    "y": 6516.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 4953.199966430664,
+    "y": 6538.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d3bca3b6.20d5e8",
+    "id": "b7ab7670.8f5828",
     "type": "comment",
     "name": "TODO: BUG -- DONE",
     "info": "momkene connectivity haye vasati ke dummy hastand ham\nvpn-binding dashte bashand ke too in path involve hast pas\nbayad bw aan niz update shavad.",
     "comments": "",
-    "x": 3716.567123413086,
-    "y": 3793.2857208251953,
-    "z": "3edf77d7.add3c",
+    "x": 3658.567123413086,
+    "y": 3815.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cb5f4cbc.1262b8",
+    "id": "c7b27212.2f5b88",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4469.100326538086,
-    "y": 4067.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4411.100326538086,
+    "y": 4089.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e967ddfe.3a6e28",
-        "90c367c2.c3898",
-        "a6021f01.4f12a"
+        "88440014.089508",
+        "6850bc1b.9b439c",
+        "ea9e63cb.45924"
       ]
     ]
   },
   {
-    "id": "1401df85.96017",
+    "id": "46e39fd1.0b23",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4577.100570678711,
-    "y": 4023.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4519.100570678711,
+    "y": 4045.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e967ddfe.3a6e28",
+    "id": "88440014.089508",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4674.100326538086,
-    "y": 4064.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4616.100326538086,
+    "y": 4086.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "358ef01b.aa0e8"
+        "94bd21f9.ba5e08"
       ]
     ]
   },
   {
-    "id": "90c367c2.c3898",
+    "id": "6850bc1b.9b439c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4657.591293334961,
-    "y": 4125.976455688477,
-    "z": "3edf77d7.add3c",
+    "x": 4599.591293334961,
+    "y": 4147.776397705078,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e4912ec.a7606d"
+        "c061eff6.efec1"
       ]
     ]
   },
   {
-    "id": "a6021f01.4f12a",
+    "id": "ea9e63cb.45924",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4655.100326538086,
-    "y": 4169.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4597.100326538086,
+    "y": 4191.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ac2440d8.b536c"
+        "302c462f.876b7a"
       ]
     ]
   },
   {
-    "id": "358ef01b.aa0e8",
+    "id": "94bd21f9.ba5e08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4842.100570678711,
-    "y": 4059.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4784.100570678711,
+    "y": 4081.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f658df6.9a7612"
+        "72fd3d1f.5c9734"
       ]
     ]
   },
   {
-    "id": "e4912ec.a7606d",
+    "id": "c061eff6.efec1",
     "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": 4820.162704467773,
-    "y": 4126.262191772461,
-    "z": "3edf77d7.add3c",
+    "x": 4762.162704467773,
+    "y": 4148.0621337890625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ac2440d8.b536c",
+    "id": "302c462f.876b7a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4822.100326538086,
-    "y": 4168.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4764.100326538086,
+    "y": 4190.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f658df6.9a7612",
+    "id": "72fd3d1f.5c9734",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5080.100570678711,
-    "y": 4064.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5022.100570678711,
+    "y": 4086.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d609729e.4f23e"
+        "e265f5c.115d288"
       ]
     ]
   },
   {
-    "id": "d609729e.4f23e",
+    "id": "e265f5c.115d288",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5314.100326538086,
-    "y": 4071.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5256.100326538086,
+    "y": 4093.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f1d3809d.7253c8"
+        "817a92f2.d780d"
       ]
     ]
   },
   {
-    "id": "ca40fb3f.0ddd08",
+    "id": "aaa5f9ec.d9ed6",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4447.800033569336,
-    "y": 3993.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4389.800033569336,
+    "y": 4015.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1e5e2cd.ecb6453",
+    "id": "4e4373ae.4e8254",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5730.949935913086,
-    "y": 4081.9854278564453,
-    "z": "3edf77d7.add3c",
+    "x": 5672.949935913086,
+    "y": 4103.785369873047,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "960f8364.63d43"
+        "8eac4849.2274f8"
       ]
     ]
   },
   {
-    "id": "960f8364.63d43",
+    "id": "8eac4849.2274f8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5922.949935913086,
-    "y": 4070.9856719970703,
-    "z": "3edf77d7.add3c",
+    "x": 5864.949935913086,
+    "y": 4092.785614013672,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f97c2bb4.e56a"
+        "a232365.4dda248"
       ]
     ]
   },
   {
-    "id": "f97c2bb4.e56a",
+    "id": "a232365.4dda248",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6104.949935913086,
-    "y": 4049.9856719970703,
-    "z": "3edf77d7.add3c",
+    "x": 6046.949935913086,
+    "y": 4071.785614013672,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b79d4999.d7cb98"
+        "992af4aa.8e2b6"
       ]
     ]
   },
   {
-    "id": "b79d4999.d7cb98",
+    "id": "992af4aa.8e2b6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6266.949935913086,
-    "y": 4038.9856719970703,
-    "z": "3edf77d7.add3c",
+    "x": 6208.949935913086,
+    "y": 4060.785614013672,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "722e24a9.0c2c14",
-        "e69b5880.065b08"
+        "1e9c08fd.18a337",
+        "74b54acc.d82234"
       ]
     ]
   },
   {
-    "id": "722e24a9.0c2c14",
+    "id": "1e9c08fd.18a337",
     "type": "set",
     "name": "unset tmp.the-connectivity",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
     "comments": "",
-    "x": 6463.949935913086,
-    "y": 3967.9856719970703,
-    "z": "3edf77d7.add3c",
+    "x": 6405.949935913086,
+    "y": 3989.785614013672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ee3fdd91.33b3e8",
+    "id": "b0ee6567.2e3a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5637.900131225586,
-    "y": 4196.985427856445,
-    "z": "3edf77d7.add3c",
+    "x": 5579.900131225586,
+    "y": 4218.785369873047,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "33a4fd6a.f05cf2",
-        "1e5e2cd.ecb6453",
-        "126e49f8.4ace7e",
-        "fdd429d6.294198"
+        "414056d.7db8ba8",
+        "4e4373ae.4e8254",
+        "1071a614.4e5e12",
+        "8f9726f3.06c69"
       ]
     ]
   },
   {
-    "id": "126e49f8.4ace7e",
+    "id": "1071a614.4e5e12",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5769.466537475586,
-    "y": 3972.2024688720703,
-    "z": "3edf77d7.add3c",
+    "x": 5711.466537475586,
+    "y": 3994.002410888672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fdd429d6.294198",
+    "id": "8f9726f3.06c69",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 5761.466537475586,
-    "y": 4021.2024688720703,
-    "z": "3edf77d7.add3c",
+    "x": 5703.466537475586,
+    "y": 4043.002410888672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e69b5880.065b08",
+    "id": "74b54acc.d82234",
     "type": "set",
     "name": "set tmp.the-connectivity.connectivity-id",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.connectivity-id' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
     "comments": "",
-    "x": 6469.416732788086,
-    "y": 4077.2024688720703,
-    "z": "3edf77d7.add3c",
+    "x": 6411.416732788086,
+    "y": 4099.002410888672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bca47127.d5cfd8",
+    "id": "7fff9c38.345784",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 5762.683334350586,
-    "y": 3795.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5704.683334350586,
+    "y": 3817.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "16b26942.410c5f",
+    "id": "aaa5e7eb.47b75",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5916.683334350586,
-    "y": 3847.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5858.683334350586,
+    "y": 3869.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "575e916.aaad5f",
+    "id": "bef4e32d.a8f0f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5507.683334350586,
-    "y": 3914.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5449.683334350586,
+    "y": 3936.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "16b26942.410c5f",
-        "4e79a048.28ceb8",
-        "bca47127.d5cfd8"
+        "aaa5e7eb.47b75",
+        "1d5352b7.2fb14d",
+        "7fff9c38.345784"
       ]
     ]
   },
   {
-    "id": "4e79a048.28ceb8",
+    "id": "1d5352b7.2fb14d",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5761.683334350586,
-    "y": 3902.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5703.683334350586,
+    "y": 3924.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d6032421.ea99d8"
+        "894732f.a692a5"
       ]
     ]
   },
   {
-    "id": "d6032421.ea99d8",
+    "id": "894732f.a692a5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5940.683334350586,
-    "y": 3901.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5882.683334350586,
+    "y": 3923.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ee3fdd91.33b3e8"
+        "b0ee6567.2e3a8"
       ]
     ]
   },
   {
-    "id": "eb8749e3.22de7",
+    "id": "81398bf4.473028",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4638.683334350586,
-    "y": 7419.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4580.683334350586,
+    "y": 7441.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "aa8c3669.88cdf8",
-        "fad2776b.9a9d28",
-        "2612fef6.812a92"
+        "6a1836f0.9e7b08",
+        "edfac497.39017",
+        "e285b49b.2789f8"
       ]
     ]
   },
   {
-    "id": "2612fef6.812a92",
+    "id": "e285b49b.2789f8",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 4861.683334350586,
-    "y": 7363.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4803.683334350586,
+    "y": 7385.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "aa8c3669.88cdf8",
+    "id": "6a1836f0.9e7b08",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5040.683334350586,
-    "y": 7406.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4982.683334350586,
+    "y": 7428.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "fad2776b.9a9d28",
+    "id": "edfac497.39017",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4885.683334350586,
-    "y": 7461.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4827.683334350586,
+    "y": 7483.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2437b1d5.2f95e6"
+        "d5b486b.df173f8"
       ]
     ]
   },
   {
-    "id": "2437b1d5.2f95e6",
+    "id": "d5b486b.df173f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5064.683334350586,
-    "y": 7460.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 5006.683334350586,
+    "y": 7482.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "268cfed4.3ed072"
+        "7de65a32.2588c4"
       ]
     ]
   },
   {
-    "id": "f140933b.8acec",
+    "id": "ecfaffd6.100b2",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4795.683334350586,
-    "y": 7099.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4737.683334350586,
+    "y": 7121.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c1a83ef0.efb158",
+    "id": "4b552ff.dab62d",
     "type": "set",
     "name": "unset secondary related variables",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
     "comments": "",
-    "x": 3361.2999420166016,
-    "y": 493.85240173339844,
-    "z": "3edf77d7.add3c",
+    "x": 3303.2999420166016,
+    "y": 515.65234375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "30c464f6.21891c",
+    "id": "3dcf3da2.14e88a",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4136.399429321289,
-    "y": 554.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 4078.399429321289,
+    "y": 576.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "92681273.ecf0b8"
+        "bfde7d38.fed19"
       ]
     ]
   },
   {
-    "id": "92681273.ecf0b8",
+    "id": "bfde7d38.fed19",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4305.399429321289,
-    "y": 551.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 4247.399429321289,
+    "y": 573.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c003a5ba.a5cd",
-        "f6645586.4c0b38"
+        "30447223.2437ce",
+        "12dff897.0ce0bf"
       ]
     ]
   },
   {
-    "id": "c003a5ba.a5cd",
+    "id": "30447223.2437ce",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4529.399429321289,
-    "y": 584.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 4471.399429321289,
+    "y": 606.65234375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f6645586.4c0b38",
+    "id": "12dff897.0ce0bf",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4475.399429321289,
-    "y": 624.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 4417.399429321289,
+    "y": 646.65234375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "513e1ab4.43497c",
+    "id": "f46ebe04.450d9",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4101.399917602539,
-    "y": 754.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 4043.399917602539,
+    "y": 775.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b7c1f5eb.1c0428"
+        "3c9b9865.e5691"
       ]
     ]
   },
   {
-    "id": "b7c1f5eb.1c0428",
+    "id": "3c9b9865.e5691",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4266.399185180664,
-    "y": 759.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 4208.399185180664,
+    "y": 780.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8d3bba48.eab118",
-        "ecf8bfe7.1b0ad8"
+        "4bcd87c1.d1b",
+        "63ed5150.d5d24"
       ]
     ]
   },
   {
-    "id": "8d3bba48.eab118",
+    "id": "4bcd87c1.d1b",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4513.399429321289,
-    "y": 841.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 4455.399429321289,
+    "y": 862.8523559570312,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ecf8bfe7.1b0ad8",
+    "id": "63ed5150.d5d24",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4459.399429321289,
-    "y": 881.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 4401.399429321289,
+    "y": 902.8523559570312,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8429e2be.11d098",
+    "id": "76a3b118.862498",
     "type": "save",
     "name": "get network-route-three from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
     "comments": "",
     "outputs": 1,
-    "x": 3344.399917602539,
-    "y": 893.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 3286.399917602539,
+    "y": 914.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ad35aa48.056498",
-        "881c5027.ef1da8",
-        "c8b7bc97.b40ba"
+        "7adb4c8f.c682bc",
+        "7eb8fd1a.3f3194",
+        "b860a47d.f11fd8"
       ]
     ]
   },
   {
-    "id": "ad35aa48.056498",
+    "id": "7adb4c8f.c682bc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3586.399917602539,
-    "y": 886.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 3528.399917602539,
+    "y": 907.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "881c5027.ef1da8",
+    "id": "7eb8fd1a.3f3194",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3581.908981323242,
-    "y": 928.4784698486328,
-    "z": "3edf77d7.add3c",
+    "x": 3523.908981323242,
+    "y": 950.2784118652344,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c8b7bc97.b40ba",
+    "id": "b860a47d.f11fd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3585.908950805664,
-    "y": 976.4784393310547,
-    "z": "3edf77d7.add3c",
+    "x": 3527.908950805664,
+    "y": 998.2783813476562,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9ce363a2.dd0398"
+        "a6ff06d4.331218"
       ]
     ]
   },
   {
-    "id": "9ce363a2.dd0398",
+    "id": "a6ff06d4.331218",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3747.399917602539,
-    "y": 917.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 3689.399917602539,
+    "y": 938.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "411baca6.4afa04"
+        "32bc585c.c7728"
       ]
     ]
   },
   {
-    "id": "411baca6.4afa04",
+    "id": "32bc585c.c7728",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3918.399917602539,
-    "y": 917.0525970458984,
-    "z": "3edf77d7.add3c",
+    "x": 3860.399917602539,
+    "y": 938.8525390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d6c02163.09f2f",
-        "26b7eb30.1a16a4",
-        "96d019f1.51b6c"
+        "e312a504.c3346",
+        "450f492a.7498d8",
+        "e7c48999.96bb5"
       ]
     ]
   },
   {
-    "id": "d6c02163.09f2f",
+    "id": "e312a504.c3346",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4085.399673461914,
-    "y": 827.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4027.399673461914,
+    "y": 848.8524780273438,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a0fe031a.dea47"
+        "e34d64db.7a9328"
       ]
     ]
   },
   {
-    "id": "26b7eb30.1a16a4",
+    "id": "450f492a.7498d8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4087.399673461914,
-    "y": 881.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4029.399673461914,
+    "y": 902.8524780273438,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "229f8aa8.94f7fe"
+        "f1b929a4.9c9ce"
       ]
     ]
   },
   {
-    "id": "a0fe031a.dea47",
+    "id": "e34d64db.7a9328",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4213.399673461914,
-    "y": 827.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4155.399673461914,
+    "y": 848.8524780273438,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4f78be1b.93fa4",
-        "f44f2336.c1f56"
+        "d0297dd0.c50e68",
+        "9996be1d.2ba6f"
       ]
     ]
   },
   {
-    "id": "229f8aa8.94f7fe",
+    "id": "f1b929a4.9c9ce",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4216.399673461914,
-    "y": 880.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4158.399673461914,
+    "y": 901.8524780273438,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a67f23a8.85781",
-        "587a77f8.86931"
+        "55ecdb35.0e00cc",
+        "c088cd20.720bd8"
       ]
     ]
   },
   {
-    "id": "f44f2336.c1f56",
+    "id": "9996be1d.2ba6f",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4459.399429321289,
-    "y": 966.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4401.399429321289,
+    "y": 987.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a67f23a8.85781",
+    "id": "55ecdb35.0e00cc",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4476.399429321289,
-    "y": 1008.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4418.399429321289,
+    "y": 1029.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "587a77f8.86931",
+    "id": "c088cd20.720bd8",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4461.399429321289,
-    "y": 1046.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4403.399429321289,
+    "y": 1067.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4f78be1b.93fa4",
+    "id": "d0297dd0.c50e68",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4473.399429321289,
-    "y": 926.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4415.399429321289,
+    "y": 947.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fcadc9d5.a748f8",
+    "id": "5eec7036.1519e8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4638.399429321289,
-    "y": 942.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4580.399429321289,
+    "y": 963.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "96d019f1.51b6c",
+    "id": "e7c48999.96bb5",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4026.399917602539,
-    "y": 972.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 3968.399917602539,
+    "y": 993.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "af991ebb.5e627"
+        "6b81c811.85e0f8"
       ]
     ]
   },
   {
-    "id": "af991ebb.5e627",
+    "id": "6b81c811.85e0f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4200.399917602539,
-    "y": 967.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 4142.399917602539,
+    "y": 988.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f09b675e.f8da7",
-        "2dc559.0e4fdaa8"
+        "2495f2a4.688896",
+        "9470a6af.62de2"
       ]
     ]
   },
   {
-    "id": "2dc559.0e4fdaa8",
+    "id": "9470a6af.62de2",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4433.399429321289,
-    "y": 1136.0522918701172,
-    "z": "3edf77d7.add3c",
+    "x": 4375.399429321289,
+    "y": 1157.8522338867188,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f09b675e.f8da7",
+    "id": "2495f2a4.688896",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4487.399429321289,
-    "y": 1096.0522918701172,
-    "z": "3edf77d7.add3c",
+    "x": 4429.399429321289,
+    "y": 1117.8522338867188,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5c549048.27d988",
+    "id": "b6c93789.479408",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4601.399429321289,
-    "y": 1121.0522918701172,
-    "z": "3edf77d7.add3c",
+    "x": 4543.399429321289,
+    "y": 1142.8522338867188,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f87c2434.973ea",
+    "id": "c1d74161.be2c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3602.066665649414,
-    "y": 2201.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3544.066665649414,
+    "y": 2223.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5b1e0335.2e861c",
-        "c761c99f.075528"
+        "855df0cd.9bb95",
+        "434e1396.d595c4"
       ]
     ]
   },
   {
-    "id": "7e1476f1.6750f8",
+    "id": "d130bfb5.a4da88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3429.400161743164,
-    "y": 2202.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3371.400161743164,
+    "y": 2224.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f87c2434.973ea"
+        "c1d74161.be2c8"
       ]
     ]
   },
   {
-    "id": "6c010aa3.624334",
+    "id": "bba37dac.291368",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3438.891128540039,
-    "y": 2244.8597869873047,
-    "z": "3edf77d7.add3c",
+    "x": 3380.891128540039,
+    "y": 2266.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "72d07b8a.849984",
+    "id": "730fab1.8beaed4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3427.400161743164,
-    "y": 2291.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3369.400161743164,
+    "y": 2313.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b1e0335.2e861c",
+    "id": "855df0cd.9bb95",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3888.400161743164,
-    "y": 2205.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3830.400161743164,
+    "y": 2227.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "279a9ed1.bf6a32",
-        "e13b8d61.77167"
+        "55a8020a.690a64",
+        "326effaf.bc448"
       ]
     ]
   },
   {
-    "id": "e13b8d61.77167",
+    "id": "326effaf.bc448",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4111.400161743164,
-    "y": 2160.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4053.400161743164,
+    "y": 2182.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "76113157.988ef"
+        "ab5c47c3.fcb968"
       ]
     ]
   },
   {
-    "id": "279a9ed1.bf6a32",
+    "id": "55a8020a.690a64",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4113.400161743164,
-    "y": 2224.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4055.400161743164,
+    "y": 2246.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "26da469d.16a06a"
+        "af7cae04.ba78a"
       ]
     ]
   },
   {
-    "id": "d7f7c5fa.4c43d8",
+    "id": "fbc065ad.333e38",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3201.400161743164,
-    "y": 2237.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3143.400161743164,
+    "y": 2259.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7e1476f1.6750f8",
-        "6c010aa3.624334",
-        "72d07b8a.849984"
+        "d130bfb5.a4da88",
+        "bba37dac.291368",
+        "730fab1.8beaed4"
       ]
     ]
   },
   {
-    "id": "1989a06e.d4f03",
+    "id": "a720f331.1ff0f",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3162.400161743164,
-    "y": 2181.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3104.400161743164,
+    "y": 2203.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "334ad959.cb8dd6",
+    "id": "62eac021.71055",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3221.400161743164,
-    "y": 1977.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3163.400161743164,
+    "y": 1999.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "52bf5f88.b043b",
-        "50b4842f.e69cbc"
+        "de7e4f57.82469",
+        "33097b2f.e0f6dc"
       ]
     ]
   },
   {
-    "id": "50b4842f.e69cbc",
+    "id": "33097b2f.e0f6dc",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3444.400161743164,
-    "y": 1963.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3386.400161743164,
+    "y": 1985.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a9726b2d.fccd7"
+        "55022710.99c7b"
       ]
     ]
   },
   {
-    "id": "52bf5f88.b043b",
+    "id": "de7e4f57.82469",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3446.400161743164,
-    "y": 1996.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3388.400161743164,
+    "y": 2018.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a9726b2d.fccd7",
+    "id": "55022710.99c7b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3592.400161743164,
-    "y": 1956.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3534.400161743164,
+    "y": 1978.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ee377e.4e34b08",
-        "eb05f6d8.e8b8d8"
+        "225a6795.34ae6",
+        "605cb253.51882c"
       ]
     ]
   },
   {
-    "id": "5ee377e.4e34b08",
+    "id": "225a6795.34ae6",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3786.400161743164,
-    "y": 1959.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3728.400161743164,
+    "y": 1981.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c761c99f.075528",
+    "id": "434e1396.d595c4",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3839.400131225586,
-    "y": 2328.2857208251953,
-    "z": "3edf77d7.add3c",
+    "x": 3781.400131225586,
+    "y": 2350.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "82e8744d.2f169"
+        "6aeddc31.02af0c"
       ]
     ]
   },
   {
-    "id": "82e8744d.2f169",
+    "id": "6aeddc31.02af0c",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.400131225586,
-    "y": 2328.2857208251953,
-    "z": "3edf77d7.add3c",
+    "x": 3987.400131225586,
+    "y": 2350.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fde94d7a.1c1f78"
+        "1d98ffa3.9dac18"
       ]
     ]
   },
   {
-    "id": "eb05f6d8.e8b8d8",
+    "id": "605cb253.51882c",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3808.400161743164,
-    "y": 2027.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3750.400161743164,
+    "y": 2049.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4c08dffc.53f9b",
-        "367fe0d1.441908",
-        "e6dd27d7.84d748"
+        "da783639.0ff76",
+        "86ac0aff.5f3f28",
+        "cebbe4ca.ee77e"
       ]
     ]
   },
   {
-    "id": "4c08dffc.53f9b",
+    "id": "da783639.0ff76",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4003.9002838134766,
-    "y": 1979.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3945.9002838134766,
+    "y": 2001.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "335d38ec.2d1a38"
+        "812fa062.6dc7c"
       ]
     ]
   },
   {
-    "id": "367fe0d1.441908",
+    "id": "86ac0aff.5f3f28",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3995.9002838134766,
-    "y": 2034.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3937.9002838134766,
+    "y": 2056.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d6efed88.7d53"
+        "8d0439b3.358a8"
       ]
     ]
   },
   {
-    "id": "e6dd27d7.84d748",
+    "id": "cebbe4ca.ee77e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4000.9002838134766,
-    "y": 2091.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3942.9002838134766,
+    "y": 2113.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "177f57a1.3eb1f8"
+        "ca5c6f17.cf3a7"
       ]
     ]
   },
   {
-    "id": "177f57a1.3eb1f8",
+    "id": "ca5c6f17.cf3a7",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4152.900283813477,
-    "y": 2092.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4094.9002838134766,
+    "y": 2114.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "335d38ec.2d1a38",
+    "id": "812fa062.6dc7c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4148.282608032227,
-    "y": 1976.9415435791016,
-    "z": "3edf77d7.add3c",
+    "x": 4090.2826080322266,
+    "y": 1998.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6ad02bf1.79a934"
+        "ad74d99d.0df72"
       ]
     ]
   },
   {
-    "id": "4bfd3207.06ef5c",
+    "id": "28bc0683.b68302",
     "type": "set",
     "name": "set SECONDARY-ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
     "comments": "",
-    "x": 3224.066665649414,
-    "y": 2316.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3166.066665649414,
+    "y": 2338.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7f049b99.392e44",
+    "id": "9656dd17.9b3ad",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3899.066635131836,
-    "y": 2280.2857208251953,
-    "z": "3edf77d7.add3c",
+    "x": 3841.066635131836,
+    "y": 2302.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "26da469d.16a06a",
+    "id": "af7cae04.ba78a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4272.400161743164,
-    "y": 2243.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4214.400161743164,
+    "y": 2265.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "76113157.988ef",
+    "id": "ab5c47c3.fcb968",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4276.400161743164,
-    "y": 2157.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4218.400161743164,
+    "y": 2179.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9aa2a686.be54a8",
-        "433203.bfdcb5fc"
+        "9a6b61ac.f8e22",
+        "26968708.bf0a2"
       ]
     ]
   },
   {
-    "id": "fde94d7a.1c1f78",
+    "id": "1d98ffa3.9dac18",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4262.685775756836,
-    "y": 2327.1074981689453,
-    "z": "3edf77d7.add3c",
+    "x": 4204.685775756836,
+    "y": 2348.907440185547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2950d492.5666c4"
+        "e0a8c937.0da4d"
       ]
     ]
   },
   {
-    "id": "d6efed88.7d53",
+    "id": "8d0439b3.358a8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4163.900283813477,
-    "y": 2037.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4105.900283813477,
+    "y": 2059.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9aa2a686.be54a8",
+    "id": "9a6b61ac.f8e22",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
     "comments": "",
-    "x": 4446.400161743164,
-    "y": 2118.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4388.400161743164,
+    "y": 2140.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "433203.bfdcb5fc",
+    "id": "26968708.bf0a2",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
     "comments": "",
-    "x": 4447.400161743164,
-    "y": 2223.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4389.400161743164,
+    "y": 2245.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "279b9c4d.6439cc",
+    "id": "826c48fa.181fa",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4442.400161743164,
-    "y": 2172.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4384.400161743164,
+    "y": 2194.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2950d492.5666c4",
+    "id": "e0a8c937.0da4d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4469.517318725586,
-    "y": 2316.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4411.517318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "27d287be.22449",
-        "54646993.252b48",
-        "ce1fcbcf.439b7"
+        "e11a9a35.e1ef78",
+        "a5abc378.a6c95",
+        "e2067ae4.4ae0a8"
       ]
     ]
   },
   {
-    "id": "27d287be.22449",
+    "id": "e11a9a35.e1ef78",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4684.517318725586,
-    "y": 2278.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4626.517318725586,
+    "y": 2300.4261169433594,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "54646993.252b48",
+    "id": "a5abc378.a6c95",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4681.517318725586,
-    "y": 2317.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4623.517318725586,
+    "y": 2339.4261169433594,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4c6f5d99.cc2504"
+        "153d06ec.f14b19"
       ]
     ]
   },
   {
-    "id": "ce1fcbcf.439b7",
+    "id": "e2067ae4.4ae0a8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4637.017318725586,
-    "y": 2359.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4579.017318725586,
+    "y": 2381.4261169433594,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "20c12f13.f01e2",
+    "id": "ff2bf803.a9fa88",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4730.400161743164,
-    "y": 1995.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4672.400161743164,
+    "y": 2017.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2b8eec9f.d7eabc"
+        "a1443a9c.9bc758"
       ]
     ]
   },
   {
-    "id": "6ad02bf1.79a934",
+    "id": "ad74d99d.0df72",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4332.400161743164,
-    "y": 1991.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4274.400161743164,
+    "y": 2013.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "656e6085.f2c5b8"
+        "aec2208e.63a7a"
       ]
     ]
   },
   {
-    "id": "656e6085.f2c5b8",
+    "id": "aec2208e.63a7a",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4527.400161743164,
-    "y": 1991.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4469.400161743164,
+    "y": 2013.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "20c12f13.f01e2",
-        "f43b8884.ec34f"
+        "ff2bf803.a9fa88",
+        "8efacaf4.128aa8"
       ]
     ]
   },
   {
-    "id": "f43b8884.ec34f",
+    "id": "8efacaf4.128aa8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4732.400161743164,
-    "y": 2068.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4674.400161743164,
+    "y": 2090.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "16e499c4.79bb2e"
+        "2140dc16.b34c34"
       ]
     ]
   },
   {
-    "id": "4c6f5d99.cc2504",
+    "id": "153d06ec.f14b19",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4862.017318725586,
-    "y": 2316.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4804.017318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "955e8579.618ad8"
+        "dc9300dc.915278"
       ]
     ]
   },
   {
-    "id": "955e8579.618ad8",
+    "id": "dc9300dc.915278",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5020.017318725586,
-    "y": 2316.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4962.017318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7f2dc653.30af1"
+        "1236d7b2.067398"
       ]
     ]
   },
   {
-    "id": "7f2dc653.30af1",
+    "id": "1236d7b2.067398",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5227.017318725586,
-    "y": 2316.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 5169.017318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2b8eec9f.d7eabc",
+    "id": "a1443a9c.9bc758",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4907.400161743164,
-    "y": 1987.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4849.400161743164,
+    "y": 2009.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6743bfb3.fe491",
-        "f129d672.d83d38"
+        "206cd74a.090e9",
+        "743406a2.17f9a"
       ]
     ]
   },
   {
-    "id": "f129d672.d83d38",
+    "id": "743406a2.17f9a",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5115.400161743164,
-    "y": 1994.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5057.400161743164,
+    "y": 2016.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2fcdf070.6eea68",
-        "1f831cdc.092a93",
-        "38d0f9ee.3ac5f6"
+        "c6f1bea4.57dda",
+        "1229be89.7bda19",
+        "b62eac2a.e73c5"
       ]
     ]
   },
   {
-    "id": "16e499c4.79bb2e",
+    "id": "2140dc16.b34c34",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4909.400161743164,
-    "y": 2060.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4851.400161743164,
+    "y": 2082.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7af0e2e8.47fa2c"
+        "348e5ae6.fa6196"
       ]
     ]
   },
   {
-    "id": "6743bfb3.fe491",
+    "id": "206cd74a.090e9",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainC id",
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5145.400161743164,
-    "y": 1942.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5087.400161743164,
+    "y": 1964.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7af0e2e8.47fa2c",
+    "id": "348e5ae6.fa6196",
     "type": "set",
     "name": "set domainC ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5144.400161743164,
-    "y": 2184.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5086.400161743164,
+    "y": 2206.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2fcdf070.6eea68",
+    "id": "c6f1bea4.57dda",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5325.400161743164,
-    "y": 1985.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5267.400161743164,
+    "y": 2007.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c8f2d024.71cdc8"
+        "55a3e51f.c94c6c"
       ]
     ]
   },
   {
-    "id": "1f831cdc.092a93",
+    "id": "1229be89.7bda19",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5317.400161743164,
-    "y": 2040.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5259.400161743164,
+    "y": 2062.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "67195fbd.2c818"
+        "dd96fb81.a1be5"
       ]
     ]
   },
   {
-    "id": "38d0f9ee.3ac5f6",
+    "id": "b62eac2a.e73c5",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5322.400161743164,
-    "y": 2097.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5264.400161743164,
+    "y": 2119.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a92d2828.f616b8"
+        "367deba0.342ae4"
       ]
     ]
   },
   {
-    "id": "a92d2828.f616b8",
+    "id": "367deba0.342ae4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5474.400161743164,
-    "y": 2098.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5416.400161743164,
+    "y": 2120.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "67195fbd.2c818",
+    "id": "dd96fb81.a1be5",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5485.400161743164,
-    "y": 2043.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5427.400161743164,
+    "y": 2065.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c8f2d024.71cdc8",
+    "id": "55a3e51f.c94c6c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5469.782485961914,
-    "y": 1982.9415435791016,
-    "z": "3edf77d7.add3c",
+    "x": 5411.782485961914,
+    "y": 2004.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2e63be54.b089ca"
+        "37dd91fc.28526e"
       ]
     ]
   },
   {
-    "id": "2e63be54.b089ca",
+    "id": "37dd91fc.28526e",
     "type": "set",
     "name": "set controller domainC data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5684.400161743164,
-    "y": 1979.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5626.400161743164,
+    "y": 2001.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7237f1d4.deff98",
+    "id": "d0d8e8f0.a69bb8",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 5713.900161743164,
-    "y": 2102.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 5655.900161743164,
+    "y": 2123.852294921875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f8b29c6c.19b2e8",
+    "id": "98d8658a.1dab08",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5686.016860961914,
-    "y": 2151.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5628.016860961914,
+    "y": 2172.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6fed43d1.51eac4"
+        "420f2345.5b5d34"
       ]
     ]
   },
   {
-    "id": "6fed43d1.51eac4",
+    "id": "420f2345.5b5d34",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5877.016860961914,
-    "y": 2155.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5819.016860961914,
+    "y": 2176.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "419e36dc.a0f56"
+        "661df626.a6b8e8"
       ]
     ]
   },
   {
-    "id": "419e36dc.a0f56",
+    "id": "661df626.a6b8e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6004.016860961914,
-    "y": 2154.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5946.016860961914,
+    "y": 2175.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "38e4a1b4.0b7b5e",
-        "e98accf8.e7a08"
+        "329453e7.3a09dc",
+        "8b47742b.726f38"
       ]
     ]
   },
   {
-    "id": "e98accf8.e7a08",
+    "id": "8b47742b.726f38",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6226.016860961914,
-    "y": 2043.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 6168.016860961914,
+    "y": 2064.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "38e4a1b4.0b7b5e",
+    "id": "329453e7.3a09dc",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6221.900161743164,
-    "y": 2102.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6163.900161743164,
+    "y": 2123.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d45ed8c9.67af08",
-        "a74deeb1.a26ec"
+        "7670a585.4e8fa4",
+        "7f78162d.05f38"
       ]
     ]
   },
   {
-    "id": "d45ed8c9.67af08",
+    "id": "7670a585.4e8fa4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6431.900161743164,
-    "y": 2079.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6373.900161743164,
+    "y": 2100.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c2c70bd5.e2175"
+        "36156797.814718"
       ]
     ]
   },
   {
-    "id": "c2c70bd5.e2175",
+    "id": "36156797.814718",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6557.900161743164,
-    "y": 2079.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6499.900161743164,
+    "y": 2100.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b21cfff5.d8a4c8"
+        "c10b0555.a1cbe"
       ]
     ]
   },
   {
-    "id": "92db42c4.6a4d78",
+    "id": "802f927b.0dcdb",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6562.900161743164,
-    "y": 2128.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6504.900161743164,
+    "y": 2149.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a32c1047.9c5c8",
-        "eadb0235.467f7",
-        "5b398d7f.65258c",
-        "7c47a5bb.9c9814"
+        "2a6e1393.0f0b94",
+        "ec798eb.b40ea7",
+        "21b7fb79.312cdc",
+        "b8684fe1.88dea8"
       ]
     ]
   },
   {
-    "id": "a74deeb1.a26ec",
+    "id": "7f78162d.05f38",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6436.900161743164,
-    "y": 2128.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6378.900161743164,
+    "y": 2149.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "92db42c4.6a4d78"
+        "802f927b.0dcdb"
       ]
     ]
   },
   {
-    "id": "b21cfff5.d8a4c8",
+    "id": "c10b0555.a1cbe",
     "type": "save",
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6885.900161743164,
-    "y": 2076.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6827.900161743164,
+    "y": 2097.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a32c1047.9c5c8",
+    "id": "2a6e1393.0f0b94",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainC",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6838.900161743164,
-    "y": 2167.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6780.900161743164,
+    "y": 2188.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "eadb0235.467f7",
+    "id": "ec798eb.b40ea7",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6786.900161743164,
-    "y": 2209.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6728.900161743164,
+    "y": 2230.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b398d7f.65258c",
+    "id": "21b7fb79.312cdc",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6915.900161743164,
-    "y": 2251.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6857.900161743164,
+    "y": 2272.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9878fd26.fb04",
+    "id": "9b3b3d66.43cb88",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6801.900161743164,
-    "y": 2124.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6743.900161743164,
+    "y": 2145.852294921875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7c47a5bb.9c9814",
+    "id": "b8684fe1.88dea8",
     "type": "save",
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6893.900161743164,
-    "y": 2299.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6835.900161743164,
+    "y": 2320.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "374c089f.fa2538",
+    "id": "d8f4cd5c.153e9",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6457.900161743164,
-    "y": 2795.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6399.900161743164,
+    "y": 2817.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e0f14a64.4f8738"
+        "1ca77427.cfd00c"
       ]
     ]
   },
   {
-    "id": "e0f14a64.4f8738",
+    "id": "1ca77427.cfd00c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6649.900161743164,
-    "y": 2790.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6591.900161743164,
+    "y": 2812.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "db26ab33.fe7e58"
+        "d48a28e3.978788"
       ]
     ]
   },
   {
-    "id": "db26ab33.fe7e58",
+    "id": "d48a28e3.978788",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6778.900161743164,
-    "y": 2790.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6720.900161743164,
+    "y": 2812.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "26e82d17.b3e8e2"
+        "cd4e9669.2bbe38"
       ]
     ]
   },
   {
-    "id": "26e82d17.b3e8e2",
+    "id": "cd4e9669.2bbe38",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 7110.900161743164,
-    "y": 2788.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 7052.900161743164,
+    "y": 2810.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c9cb4066.4924",
+    "id": "96928e3.987df7",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6042.900161743164,
-    "y": 3007.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 5984.900161743164,
+    "y": 3029.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2a720623.f2b5c2"
+        "181572ea.9107d5"
       ]
     ]
   },
   {
-    "id": "2a720623.f2b5c2",
+    "id": "181572ea.9107d5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6222.900161743164,
-    "y": 3006.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6164.900161743164,
+    "y": 3028.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "af745266.aa6"
+        "8cd8419f.cb3a9"
       ]
     ]
   },
   {
-    "id": "af745266.aa6",
+    "id": "8cd8419f.cb3a9",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6351.900161743164,
-    "y": 3006.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6293.900161743164,
+    "y": 3028.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "981d0119.b686c"
+        "d6cc041.8a7c3f8"
       ]
     ]
   },
   {
-    "id": "981d0119.b686c",
+    "id": "d6cc041.8a7c3f8",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6569.783462524414,
-    "y": 3005.7357025146484,
-    "z": "3edf77d7.add3c",
+    "x": 6511.783462524414,
+    "y": 3027.53564453125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "365c0f8e.cfd0e"
+        "b0604621.14aa3"
       ]
     ]
   },
   {
-    "id": "365c0f8e.cfd0e",
+    "id": "b0604621.14aa3",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6784.783462524414,
-    "y": 3005.7357025146484,
-    "z": "3edf77d7.add3c",
+    "x": 6726.783462524414,
+    "y": 3027.53564453125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5255edd.4efb714"
+        "1b23239.265d75c"
       ]
     ]
   },
   {
-    "id": "5255edd.4efb714",
+    "id": "1b23239.265d75c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6916.783462524414,
-    "y": 3005.7357025146484,
-    "z": "3edf77d7.add3c",
+    "x": 6858.783462524414,
+    "y": 3027.53564453125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d5b5d130.3528a"
+        "e0661126.3d63c"
       ]
     ]
   },
   {
-    "id": "d5b5d130.3528a",
+    "id": "e0661126.3d63c",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 7280.900161743164,
-    "y": 3004.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 7222.900161743164,
+    "y": 3026.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "615783e8.7114bc",
+    "id": "ba199ac4.fb848",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5013.399185180664,
-    "y": 2655.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4955.399185180664,
+    "y": 2677.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b5a2c9a9.2d0b1"
+        "3b9234ec.069ca4"
       ]
     ]
   },
   {
-    "id": "b5a2c9a9.2d0b1",
+    "id": "3b9234ec.069ca4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5193.399185180664,
-    "y": 2654.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5135.399185180664,
+    "y": 2676.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "38f8112d.6307b6"
+        "9eae322e.b63d4"
       ]
     ]
   },
   {
-    "id": "38f8112d.6307b6",
+    "id": "9eae322e.b63d4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5322.399185180664,
-    "y": 2654.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5264.399185180664,
+    "y": 2676.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "73260aa7.cfafe4"
+        "d93117f0.529c08"
       ]
     ]
   },
   {
-    "id": "3fb31c3b.d5983c",
+    "id": "eef4e51b.ad8f08",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5058.399185180664,
-    "y": 2713.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5000.399185180664,
+    "y": 2735.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "73260aa7.cfafe4",
+    "id": "d93117f0.529c08",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5088.399185180664,
-    "y": 2746.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5030.399185180664,
+    "y": 2768.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4f61494b.d04d88",
-        "50778a9c.0e895c",
-        "979ddcd.34a972"
+        "cef39c15.c2efe8",
+        "19cfaa23.53868e",
+        "3979c231.eba74e"
       ]
     ]
   },
   {
-    "id": "50778a9c.0e895c",
+    "id": "19cfaa23.53868e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5269.890151977539,
-    "y": 2723.9932708740234,
-    "z": "3edf77d7.add3c",
+    "x": 5211.890151977539,
+    "y": 2745.793212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "67ea0823.c7b72"
+        "11983801.6e819"
       ]
     ]
   },
   {
-    "id": "979ddcd.34a972",
+    "id": "3979c231.eba74e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5258.399185180664,
-    "y": 2763.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5200.399185180664,
+    "y": 2785.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c80cb8af.ac2d48"
+        "df1ec346.4539a"
       ]
     ]
   },
   {
-    "id": "67ea0823.c7b72",
+    "id": "11983801.6e819",
     "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": 5429.461685180664,
-    "y": 2722.2789154052734,
-    "z": "3edf77d7.add3c",
+    "x": 5371.461685180664,
+    "y": 2744.078857421875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c80cb8af.ac2d48",
+    "id": "df1ec346.4539a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5419.399185180664,
-    "y": 2764.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5361.399185180664,
+    "y": 2786.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4f61494b.d04d88",
+    "id": "cef39c15.c2efe8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5263.399185180664,
-    "y": 2800.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5205.399185180664,
+    "y": 2822.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ef6cfd54.d63cb8"
+        "ce54950d.a0123"
       ]
     ]
   },
   {
-    "id": "ef6cfd54.d63cb8",
+    "id": "ce54950d.a0123",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5421.399185180664,
-    "y": 2808.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5363.399185180664,
+    "y": 2830.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d727e5a5.b31118",
-        "c17b79a.0f49c88"
+        "f7f8d3b0.147e88",
+        "b341778e.b63ef8"
       ]
     ]
   },
   {
-    "id": "d727e5a5.b31118",
+    "id": "f7f8d3b0.147e88",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5582.399185180664,
-    "y": 2740.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5524.399185180664,
+    "y": 2762.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c17b79a.0f49c88",
+    "id": "b341778e.b63ef8",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5624.399185180664,
-    "y": 2812.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5566.399185180664,
+    "y": 2834.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9c79a60.2e838d8",
+    "id": "8414e4a1.38b9c8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5100.399185180664,
-    "y": 3013.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5042.399185180664,
+    "y": 3035.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c138ef39.513f8"
+        "671d16b.b80a7e8"
       ]
     ]
   },
   {
-    "id": "c138ef39.513f8",
+    "id": "671d16b.b80a7e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5280.399185180664,
-    "y": 3012.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5222.399185180664,
+    "y": 3034.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8ad866ac.595d58"
+        "119e2009.a17608"
       ]
     ]
   },
   {
-    "id": "8ad866ac.595d58",
+    "id": "119e2009.a17608",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5409.399185180664,
-    "y": 3012.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5351.399185180664,
+    "y": 3034.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "17191cff.7c3d3b"
+        "473f5087.37a1e8"
       ]
     ]
   },
   {
-    "id": "2bf187fb.3634e8",
+    "id": "5e936e89.558fa8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5145.399185180664,
-    "y": 3071.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5087.399185180664,
+    "y": 3093.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "17191cff.7c3d3b",
+    "id": "473f5087.37a1e8",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5175.399185180664,
-    "y": 3104.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5117.399185180664,
+    "y": 3126.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e2951a5a.6753c8",
-        "f24616d3.430fb8",
-        "57d651f0.348b08"
+        "d9f85915.dda38",
+        "24241f4e.c44408",
+        "225969a9.a7207e"
       ]
     ]
   },
   {
-    "id": "f24616d3.430fb8",
+    "id": "24241f4e.c44408",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5356.890151977539,
-    "y": 3081.9932708740234,
-    "z": "3edf77d7.add3c",
+    "x": 5298.890151977539,
+    "y": 3103.793212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c95458c9.25b988"
+        "96c74d33.8dbf8"
       ]
     ]
   },
   {
-    "id": "57d651f0.348b08",
+    "id": "225969a9.a7207e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5345.399185180664,
-    "y": 3121.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5287.399185180664,
+    "y": 3143.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "59776330.9b2ecc"
+        "591af841.3626"
       ]
     ]
   },
   {
-    "id": "c95458c9.25b988",
+    "id": "96c74d33.8dbf8",
     "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": 5516.461685180664,
-    "y": 3080.2789154052734,
-    "z": "3edf77d7.add3c",
+    "x": 5458.461685180664,
+    "y": 3102.078857421875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "59776330.9b2ecc",
+    "id": "591af841.3626",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5506.399185180664,
-    "y": 3122.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5448.399185180664,
+    "y": 3144.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e2951a5a.6753c8",
+    "id": "d9f85915.dda38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5350.399185180664,
-    "y": 3158.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5292.399185180664,
+    "y": 3180.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1f0787c1.98ffc"
+        "211d205d.25f7f"
       ]
     ]
   },
   {
-    "id": "1f0787c1.98ffc",
+    "id": "211d205d.25f7f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5508.399185180664,
-    "y": 3166.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5450.399185180664,
+    "y": 3188.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4ff50da8.51bbec",
-        "fc471e6.a2d406"
+        "d0bfd54a.d36bc8",
+        "7dc2fca0.94494c"
       ]
     ]
   },
   {
-    "id": "4ff50da8.51bbec",
+    "id": "d0bfd54a.d36bc8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5669.399185180664,
-    "y": 3098.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5611.399185180664,
+    "y": 3120.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fc471e6.a2d406",
+    "id": "7dc2fca0.94494c",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5711.399185180664,
-    "y": 3170.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5653.399185180664,
+    "y": 3192.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "2987a87c.d9af38",
+    "id": "3f0ddd6.f3f1022",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3582.066665649414,
-    "y": 4595.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3524.066665649414,
+    "y": 4617.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "101679fa.cd8636"
+        "358e9751.c712f"
       ]
     ]
   },
   {
-    "id": "101679fa.cd8636",
+    "id": "358e9751.c712f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3762.066665649414,
-    "y": 4594.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3704.066665649414,
+    "y": 4616.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a4d69355.b5e7f8"
+        "6884e019.44294"
       ]
     ]
   },
   {
-    "id": "a4d69355.b5e7f8",
+    "id": "6884e019.44294",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3891.066665649414,
-    "y": 4594.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3833.066665649414,
+    "y": 4616.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "42187454.b3e72c"
+        "5116cf4b.8d29a"
       ]
     ]
   },
   {
-    "id": "8dc12596.0dad2",
+    "id": "bd6b4020.6dbe8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3627.066665649414,
-    "y": 4653.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3569.066665649414,
+    "y": 4675.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "42187454.b3e72c",
+    "id": "5116cf4b.8d29a",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3657.066665649414,
-    "y": 4686.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3599.066665649414,
+    "y": 4708.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "53201291.0789d4",
-        "6de03a2b.1543fc",
-        "13099433.0c6bc4"
+        "2e2530b5.6396c8",
+        "a3a43577.5b69d",
+        "ed68f855.e91bf8"
       ]
     ]
   },
   {
-    "id": "6de03a2b.1543fc",
+    "id": "a3a43577.5b69d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3838.557632446289,
-    "y": 4663.993270874023,
-    "z": "3edf77d7.add3c",
+    "x": 3780.557632446289,
+    "y": 4685.793212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "328b19c8.a304fe"
+        "86842579.52f86"
       ]
     ]
   },
   {
-    "id": "13099433.0c6bc4",
+    "id": "ed68f855.e91bf8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3827.066665649414,
-    "y": 4703.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3769.066665649414,
+    "y": 4725.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "693d642a.e0385c"
+        "73eac34a.dab10c"
       ]
     ]
   },
   {
-    "id": "328b19c8.a304fe",
+    "id": "86842579.52f86",
     "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": 3998.129165649414,
-    "y": 4662.278915405273,
-    "z": "3edf77d7.add3c",
+    "x": 3940.129165649414,
+    "y": 4684.078857421875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "693d642a.e0385c",
+    "id": "73eac34a.dab10c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3988.066665649414,
-    "y": 4704.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3930.066665649414,
+    "y": 4726.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "53201291.0789d4",
+    "id": "2e2530b5.6396c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3832.066665649414,
-    "y": 4740.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3774.066665649414,
+    "y": 4762.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "def4b54e.65d1b"
+        "744d2f9d.2ccba"
       ]
     ]
   },
   {
-    "id": "def4b54e.65d1b",
+    "id": "744d2f9d.2ccba",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3990.066665649414,
-    "y": 4748.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3932.066665649414,
+    "y": 4770.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c5033189.07a6e8",
-        "bea5279c.558ed8"
+        "e108af78.2fc248",
+        "9bbc731d.e00988"
       ]
     ]
   },
   {
-    "id": "c5033189.07a6e8",
+    "id": "e108af78.2fc248",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4151.066665649414,
-    "y": 4680.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4093.066665649414,
+    "y": 4702.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bea5279c.558ed8",
+    "id": "9bbc731d.e00988",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4193.066665649414,
-    "y": 4752.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4135.066665649414,
+    "y": 4774.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "be749200.95b238",
+    "id": "75777f0a.fb1b9",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4273.733657836914,
-    "y": 5550.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4215.733657836914,
+    "y": 5572.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b311bb82.023748",
+    "id": "4f6ebd11.7928d4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4428.733657836914,
-    "y": 5591.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4370.733657836914,
+    "y": 5613.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2f4b1c2.9aee8",
+    "id": "53cb53b2.198aa4",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4244.733657836914,
-    "y": 5649.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4186.733657836914,
+    "y": 5671.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7d42099c.1673f8",
-        "afcc0a1f.ae4ca8"
+        "7b1794a5.b1fc24",
+        "60cb3386.52366c"
       ]
     ]
   },
   {
-    "id": "7d42099c.1673f8",
+    "id": "7b1794a5.b1fc24",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4480.733657836914,
-    "y": 5633.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4422.733657836914,
+    "y": 5655.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1db6f77.6e57a09"
+        "d1b5ec1f.66461"
       ]
     ]
   },
   {
-    "id": "afcc0a1f.ae4ca8",
+    "id": "60cb3386.52366c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4479.733657836914,
-    "y": 5681.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4421.733657836914,
+    "y": 5703.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1db6f77.6e57a09",
+    "id": "d1b5ec1f.66461",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4624.733657836914,
-    "y": 5635.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4566.733657836914,
+    "y": 5657.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "435458de.d8d258",
-        "fe506663.263e38",
-        "7c36c2be.89228c"
+        "2e676cc9.ce26a4",
+        "6e286f3d.8e0a28",
+        "e2964af9.ec57d8"
       ]
     ]
   },
   {
-    "id": "435458de.d8d258",
+    "id": "2e676cc9.ce26a4",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5036.733901977539,
-    "y": 5770.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4978.733901977539,
+    "y": 5792.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fe506663.263e38",
+    "id": "6e286f3d.8e0a28",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5157.733901977539,
-    "y": 5817.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5099.733901977539,
+    "y": 5839.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a2e81b2.7cd548",
+    "id": "a459d12f.16fa1",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5040.617691040039,
-    "y": 5861.302352905273,
-    "z": "3edf77d7.add3c",
+    "x": 4982.617691040039,
+    "y": 5883.102294921875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7c36c2be.89228c",
+    "id": "e2964af9.ec57d8",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5039.400894165039,
-    "y": 5902.502548217773,
-    "z": "3edf77d7.add3c",
+    "x": 4981.400894165039,
+    "y": 5924.302490234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c09fba5.801644",
+    "id": "f2f8d85f.c68ad8",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4900.066665649414,
-    "y": 6156.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4842.066665649414,
+    "y": 6178.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2fa7a2c0.97e2e6",
+    "id": "9cfb7864.e0e548",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5066.066665649414,
-    "y": 6195.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5008.066665649414,
+    "y": 6217.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed4e275a.a600a",
+    "id": "98761b9f.ff6118",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4905.066665649414,
-    "y": 6245.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4847.066665649414,
+    "y": 6267.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ed92a8d.935c6c",
-        "3b32d9b.10ad726"
+        "ebc03603.139de",
+        "22cd6c36.3aa1dc"
       ]
     ]
   },
   {
-    "id": "5ed92a8d.935c6c",
+    "id": "ebc03603.139de",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5138.066665649414,
-    "y": 6239.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5080.066665649414,
+    "y": 6261.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4b8f3c41.8b089c"
+        "3bf7ac87.926a04"
       ]
     ]
   },
   {
-    "id": "3b32d9b.10ad726",
+    "id": "22cd6c36.3aa1dc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5139.066665649414,
-    "y": 6289.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5081.066665649414,
+    "y": 6311.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4b8f3c41.8b089c",
+    "id": "3bf7ac87.926a04",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5285.066665649414,
-    "y": 6247.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5227.066665649414,
+    "y": 6269.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "980344cd.e7e958",
-        "6a19d23d.0e42e4",
-        "b0adad9f.731368"
+        "7682c7bc.9b0958",
+        "fc925053.188248",
+        "d17759a6.e157b"
       ]
     ]
   },
   {
-    "id": "980344cd.e7e958",
+    "id": "7682c7bc.9b0958",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5532.066665649414,
-    "y": 6235.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5474.066665649414,
+    "y": 6257.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6a19d23d.0e42e4",
+    "id": "fc925053.188248",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5653.066665649414,
-    "y": 6282.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5595.066665649414,
+    "y": 6304.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "351a146f.cf6ee4",
+    "id": "a868892a.829a98",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5535.950454711914,
-    "y": 6326.302352905273,
-    "z": "3edf77d7.add3c",
+    "x": 5477.950454711914,
+    "y": 6348.102294921875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b0adad9f.731368",
+    "id": "d17759a6.e157b",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5534.733657836914,
-    "y": 6367.502548217773,
-    "z": "3edf77d7.add3c",
+    "x": 5476.733657836914,
+    "y": 6389.302490234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "62fdede4.849824",
+    "id": "b6de4106.8135",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3662.066665649414,
-    "y": 6140.852645874023,
-    "z": "3edf77d7.add3c",
+    "x": 3604.066665649414,
+    "y": 6162.652587890625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "dfc7a62b.53e19",
+    "id": "37dc60ca.62221",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2999.316665649414,
-    "y": 6139.102645874023,
-    "z": "3edf77d7.add3c",
+    "x": 2941.316665649414,
+    "y": 6160.902587890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4e06d40d.0d98f4",
-        "2df2f3f0.950c74"
+        "196d7b7.c07cd85",
+        "bc377eb3.be507"
       ]
     ]
   },
   {
-    "id": "4e06d40d.0d98f4",
+    "id": "196d7b7.c07cd85",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3190.316665649414,
-    "y": 6143.102645874023,
-    "z": "3edf77d7.add3c",
+    "x": 3132.316665649414,
+    "y": 6164.902587890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7ac2dc81.94449c"
+        "65fedbab.47a65c"
       ]
     ]
   },
   {
-    "id": "7ac2dc81.94449c",
+    "id": "65fedbab.47a65c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3317.316665649414,
-    "y": 6142.102645874023,
-    "z": "3edf77d7.add3c",
+    "x": 3259.316665649414,
+    "y": 6163.902587890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "62fdede4.849824"
+        "b6de4106.8135"
       ]
     ]
   },
   {
-    "id": "2df2f3f0.950c74",
+    "id": "bc377eb3.be507",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3186.316665649414,
-    "y": 6213.102645874023,
-    "z": "3edf77d7.add3c",
+    "x": 3128.316665649414,
+    "y": 6234.902587890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4a8e4e30.44e1e8"
+        "e0efce2f.f6bfe"
       ]
     ]
   },
   {
-    "id": "717a4778.c8606",
+    "id": "7ecde40.b1b951c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3735.816665649414,
-    "y": 6212.186141967773,
-    "z": "3edf77d7.add3c",
+    "x": 3677.816665649414,
+    "y": 6233.986083984375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a8e4e30.44e1e8",
+    "id": "e0efce2f.f6bfe",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3319.816665649414,
-    "y": 6215.186141967773,
-    "z": "3edf77d7.add3c",
+    "x": 3261.816665649414,
+    "y": 6236.986083984375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "717a4778.c8606"
+        "7ecde40.b1b951c"
       ]
     ]
   }
-- 
cgit 1.2.3-korg